This is a note to let you know that I've just added the patch titled xfs: set prealloc flag in xfs_alloc_file_space() to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: xfs-set-prealloc-flag-in-xfs_alloc_file_space.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From stable-owner@xxxxxxxxxxxxxxx Sat Mar 18 11:16:01 2023 From: Amir Goldstein <amir73il@xxxxxxxxx> Date: Sat, 18 Mar 2023 12:15:20 +0200 Subject: xfs: set prealloc flag in xfs_alloc_file_space() To: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Sasha Levin <sashal@xxxxxxxxxx>, "Darrick J . Wong" <djwong@xxxxxxxxxx>, Leah Rumancik <leah.rumancik@xxxxxxxxx>, Chandan Babu R <chandan.babu@xxxxxxxxxx>, Christian Brauner <brauner@xxxxxxxxxx>, linux-fsdevel@xxxxxxxxxxxxxxx, linux-xfs@xxxxxxxxxxxxxxx, stable@xxxxxxxxxxxxxxx, Dave Chinner <dchinner@xxxxxxxxxx> Message-ID: <20230318101529.1361673-7-amir73il@xxxxxxxxx> From: Dave Chinner <dchinner@xxxxxxxxxx> commit 0b02c8c0d75a738c98c35f02efb36217c170d78c upstream. [backport for 5.10.y] Now that we only call xfs_update_prealloc_flags() from xfs_file_fallocate() in the case where we need to set the preallocation flag, do this in xfs_alloc_file_space() where we already have the inode joined into a transaction and get rid of the call to xfs_update_prealloc_flags() from the fallocate code. This also means that we now correctly avoid setting the XFS_DIFLAG_PREALLOC flag when xfs_is_always_cow_inode() is true, as these inodes will never have preallocated extents. Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/xfs/xfs_bmap_util.c | 9 +++------ fs/xfs/xfs_file.c | 8 -------- 2 files changed, 3 insertions(+), 14 deletions(-) --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -800,9 +800,6 @@ xfs_alloc_file_space( quota_flag = XFS_QMOPT_RES_REGBLKS; } - /* - * Allocate and setup the transaction. - */ error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, resrtextents, 0, &tp); @@ -830,9 +827,9 @@ xfs_alloc_file_space( if (error) goto error0; - /* - * Complete the transaction - */ + ip->i_d.di_flags |= XFS_DIFLAG_PREALLOC; + xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); + error = xfs_trans_commit(tp); xfs_iunlock(ip, XFS_ILOCK_EXCL); if (error) --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -850,7 +850,6 @@ xfs_file_fallocate( struct inode *inode = file_inode(file); struct xfs_inode *ip = XFS_I(inode); long error; - enum xfs_prealloc_flags flags = 0; uint iolock = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL; loff_t new_size = 0; bool do_file_insert = false; @@ -948,8 +947,6 @@ xfs_file_fallocate( } do_file_insert = true; } else { - flags |= XFS_PREALLOC_SET; - if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + len > i_size_read(inode)) { new_size = offset + len; @@ -1000,11 +997,6 @@ xfs_file_fallocate( if (error) goto out_unlock; } - - error = xfs_update_prealloc_flags(ip, XFS_PREALLOC_SET); - if (error) - goto out_unlock; - } /* Change file size if needed */ Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are queue-5.10/xfs-fallocate-should-call-file_modified.patch queue-5.10/attr-add-setattr_should_drop_sgid.patch queue-5.10/xfs-set-prealloc-flag-in-xfs_alloc_file_space.patch queue-5.10/xfs-purge-dquots-after-inode-walk-fails-during-quotacheck.patch queue-5.10/fs-use-consistent-setgid-checks-in-is_sxid.patch queue-5.10/xfs-remove-xfs_prealloc_sync.patch queue-5.10/attr-add-in_group_or_capable.patch queue-5.10/xfs-don-t-assert-fail-on-perag-references-on-teardown.patch queue-5.10/xfs-don-t-leak-btree-cursor-when-insrec-fails-after-a-split.patch queue-5.10/fs-move-s_isgid-stripping-into-the-vfs_-helpers.patch queue-5.10/xfs-remove-xfs_setattr_time-declaration.patch queue-5.10/fs-move-should_remove_suid.patch queue-5.10/attr-use-consistent-sgid-stripping-checks.patch queue-5.10/fs-add-mode_strip_sgid-helper.patch queue-5.10/xfs-use-setattr_copy-to-set-vfs-inode-attributes.patch