summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJohn Garry <john.g.garry@oracle.com>2025-06-11 14:01:18 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-27 11:07:19 +0100
commite05d4d0641ef3fb2945eb9e269ff40273dfea83c (patch)
tree070b054bc515b21ceca1732e6a193ae60fb52f22 /fs
parent8cd7bf062276b67aca798e948e3120566265d893 (diff)
downloadlinux-e05d4d0641ef3fb2945eb9e269ff40273dfea83c.tar.gz
linux-e05d4d0641ef3fb2945eb9e269ff40273dfea83c.tar.bz2
linux-e05d4d0641ef3fb2945eb9e269ff40273dfea83c.zip
xfs: Fix xfs_flush_unmap_range() range for RT
[ Upstream commit d3b689d7c711a9f36d3e48db9eaa75784a892f4c ] 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@lst.de>4 Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: John Garry <john.g.garry@oracle.com> Signed-off-by: Chandan Babu R <chandanbabu@kernel.org> Signed-off-by: Leah Rumancik <leah.rumancik@gmail.com> Acked-by: "Darrick J. Wong" <djwong@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_bmap_util.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 62b92e92a685..dabae6323c50 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -963,14 +963,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_64(offset, rounding);
+ end = roundup_64(offset + len, rounding) - 1;
error = filemap_write_and_wait_range(inode->i_mapping, start, end);
if (error)