On Thu, May 09, 2024 at 10:40:56AM +0000, John Garry wrote:
> Currently xfs_flush_unmap_range() does unmap for a full RT extent range,
> which we also want to ensure is clean and idle.
>
> This code change is originally from Dave Chinner.
>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
> Signed-off-by: John Garry <john.g.garry@xxxxxxxxxx>
> ---
> fs/xfs/xfs_bmap_util.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index ac2e77ebb54c..5d4aac50cbf5 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -794,14 +794,18 @@ xfs_flush_unmap_range(
> xfs_off_t offset,
> xfs_off_t len)
> {
> - struct xfs_mount *mp = ip->i_mount;
> struct inode *inode = VFS_I(ip);
> xfs_off_t rounding, start, end;
> int error;
>
> - rounding = max_t(xfs_off_t, mp->m_sb.sb_blocksize, PAGE_SIZE);
> - start = round_down(offset, rounding);
> - end = round_up(offset + len, rounding) - 1;
> + /*
> + * Make sure we extend the flush out to extent alignment
> + * boundaries so any extent range overlapping the start/end
> + * of the modification we are about to do is clean and idle.
> + */
> + rounding = max_t(xfs_off_t, xfs_inode_alloc_unitsize(ip), PAGE_SIZE);
> + start = rounddown(offset, rounding);
> + end = roundup(offset + len, rounding) - 1;
These are 64 bit values, so roundup_64() and rounddown_64().
-Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
