Commit 41b9d7263ea1e270019c5d04fa0ab15db50b9725

Authored by Brian Foster
Committed by Dave Chinner
1 parent 1669a8ca21

xfs: trim eofblocks before collapse range

xfs_collapse_file_space() currently writes back the entire file
undergoing collapse range to settle things down for the extent shift
algorithm. While this prevents changes to the extent list during the
collapse operation, the writeback itself is not enough to prevent
unnecessary collapse failures.

The current shift algorithm uses the extent index to iterate the in-core
extent list. If a post-eof delalloc extent persists after the writeback
(e.g., a prior zero range op where the end of the range aligns with eof
can separate the post-eof blocks such that they are not written back and
converted), xfs_bmap_shift_extents() becomes confused over the encoded
br_startblock value and fails the collapse.

As with the full writeback, this is a temporary fix until the algorithm
is improved to cope with a volatile extent list and avoid attempts to
shift post-eof extents.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>

Showing 1 changed file with 9 additions and 2 deletions Side-by-side Diff

fs/xfs/xfs_bmap_util.c
... ... @@ -1471,8 +1471,10 @@
1471 1471 shift_fsb = XFS_B_TO_FSB(mp, len);
1472 1472  
1473 1473 /*
1474   - * writeback the entire file to prevent concurrent writeback of ranges
1475   - * outside the collapsing region from changing the extent list.
  1474 + * Writeback the entire file and force remove any post-eof blocks. The
  1475 + * writeback prevents changes to the extent list via concurrent
  1476 + * writeback and the eofblocks trim prevents the extent shift algorithm
  1477 + * from running into a post-eof delalloc extent.
1476 1478 *
1477 1479 * XXX: This is a temporary fix until the extent shift loop below is
1478 1480 * converted to use offsets and lookups within the ILOCK rather than
... ... @@ -1482,6 +1484,11 @@
1482 1484 error = filemap_write_and_wait(VFS_I(ip)->i_mapping);
1483 1485 if (error)
1484 1486 return error;
  1487 + if (xfs_can_free_eofblocks(ip, true)) {
  1488 + error = xfs_free_eofblocks(mp, ip, false);
  1489 + if (error)
  1490 + return error;
  1491 + }
1485 1492  
1486 1493 error = xfs_free_file_space(ip, offset, len);
1487 1494 if (error)