]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
xfs: check XFS_EOFBLOCKS_RELEASED earlier in xfs_release_eofblocks
authorChristoph Hellwig <hch@lst.de>
Tue, 13 Aug 2024 07:39:40 +0000 (09:39 +0200)
committerChandan Babu R <chandanbabu@kernel.org>
Tue, 3 Sep 2024 04:37:38 +0000 (10:07 +0530)
If the XFS_EOFBLOCKS_RELEASED flag is set, we are not going to free the
eofblocks, so don't bother locking the inode or performing the checks in
xfs_can_free_eofblocks.  Also switch to a test_and_set operation once
the iolock has been acquire so that only the caller that sets it actually
frees the post-EOF blocks.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
fs/xfs/xfs_file.c

index 30b553ac8f56bb026646b76ec6592d0410e97ba5..986448d1ff3c0cf3fa5d615ca132371750e85454 100644 (file)
@@ -1234,12 +1234,11 @@ xfs_file_release(
         */
        if (inode->i_nlink &&
            (file->f_mode & FMODE_WRITE) &&
+           !xfs_iflags_test(ip, XFS_EOFBLOCKS_RELEASED) &&
            xfs_ilock_nowait(ip, XFS_IOLOCK_EXCL)) {
                if (xfs_can_free_eofblocks(ip) &&
-                   !xfs_iflags_test(ip, XFS_EOFBLOCKS_RELEASED)) {
+                   !xfs_iflags_test_and_set(ip, XFS_EOFBLOCKS_RELEASED))
                        xfs_free_eofblocks(ip);
-                       xfs_iflags_set(ip, XFS_EOFBLOCKS_RELEASED);
-               }
                xfs_iunlock(ip, XFS_IOLOCK_EXCL);
        }