Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7e0b6ff authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: make iomap_begin functions trim iomaps consistently 



Historically, the XFS iomap_begin function only returned mappings for
exactly the range queried, i.e. it doesn't do XFS_BMAPI_ENTIRE lookups.
The current vfs iomap consumers are only set up to deal with trimmed
mappings.  xfs_xattr_iomap_begin does BMAPI_ENTIRE lookups, which is
inconsistent with the current iomap usage.  Remove the flag so that both
iomap_begin functions behave the same way.

FWIW this also fixes a behavioral regression in xattr FIEMAP that was
introduced in 4.8 wherein attr fork extents are no longer trimmed like
they used to be.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent f59cf5c2

fs/xfs/xfs_iomap.c

+1 −1
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ xfs_xattr_iomap_begin( 


	ASSERT(ip->i_d.di_aformat != XFS_DINODE_FMT_LOCAL);

	error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb, &imap,

			       &nimaps, XFS_BMAPI_ENTIRE | XFS_BMAPI_ATTRFORK);

			       &nimaps, XFS_BMAPI_ATTRFORK);

out_unlock:

	xfs_iunlock(ip, lockmode);