xfs: fix simplify extent lookup in xfs_can_free_eofblocks
commit 62027820eb4486f075b89ec31c1548c6cb1bb13f upstream. In commit11f4c3a53a, we tried to simplify the extent lookup in xfs_can_free_eofblocks so that it doesn't incur the overhead of all the extra stuff that xfs_bmapi_read does around the iext lookup. Unfortunately, this causes regressions on generic/603, xfs/108, generic/219, xfs/173, generic/694, xfs/052, generic/230, and xfs/441 when always_cow is turned on. In all cases, the regressions take the form of alwayscow files consuming rather more space than the golden output is expecting. I observed that in all these cases, the cause of the excess space usage was due to CoW fork delalloc reservations that go beyond EOF. For alwayscow files we allow posteof delalloc CoW reservations because all writes go through the CoW fork. Recall that all extents in the CoW fork are accounted for via i_delayed_blks, which means that prior to this patch, we'd invoke xfs_free_eofblocks on first close if anything was in the CoW fork. Now we don't do that. Fix the problem by reverting the removal of the i_delayed_blks check. Cc: <stable@vger.kernel.org> # v6.12-rc1 Fixes:11f4c3a53a("xfs: simplify extent lookup in xfs_can_free_eofblocks") Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
6ba6f7f29e
commit
66b6062986
@@ -546,10 +546,14 @@ xfs_can_free_eofblocks(
|
||||
return false;
|
||||
|
||||
/*
|
||||
* Check if there is an post-EOF extent to free.
|
||||
* Check if there is an post-EOF extent to free. If there are any
|
||||
* delalloc blocks attached to the inode (data fork delalloc
|
||||
* reservations or CoW extents of any kind), we need to free them so
|
||||
* that inactivation doesn't fail to erase them.
|
||||
*/
|
||||
xfs_ilock(ip, XFS_ILOCK_SHARED);
|
||||
if (xfs_iext_lookup_extent(ip, &ip->i_df, end_fsb, &icur, &imap))
|
||||
if (ip->i_delayed_blks ||
|
||||
xfs_iext_lookup_extent(ip, &ip->i_df, end_fsb, &icur, &imap))
|
||||
found_blocks = true;
|
||||
xfs_iunlock(ip, XFS_ILOCK_SHARED);
|
||||
return found_blocks;
|
||||
|
||||
Reference in New Issue
Block a user