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

Commit a7b28f72 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: don't use XFS_BMAPI_IGSTATE in xfs_map_blocks 



We want to be able to use the extent state as a reliably indicator for
the type of I/O, and stop using the buffer head state.  For this we
need to stop using the XFS_BMAPI_IGSTATE so that we don't see merged
extents of different types.

Based on a patch from Dave Chinner.

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

fs/xfs/xfs_aops.c

+1 −4
Original line number Diff line number Diff line
@@ -373,7 +373,6 @@ xfs_map_blocks( 
	ssize_t			count = i_blocksize(inode);

	xfs_fileoff_t		offset_fsb, end_fsb;

	int			error = 0;

	int			bmapi_flags = XFS_BMAPI_ENTIRE;

	int			nimaps = 1;



	if (XFS_FORCED_SHUTDOWN(mp))
@@ -393,8 +392,6 @@ xfs_map_blocks( 
		return 0;



	ASSERT(type != XFS_IO_COW);

	if (type == XFS_IO_UNWRITTEN)

		bmapi_flags |= XFS_BMAPI_IGSTATE;



	xfs_ilock(ip, XFS_ILOCK_SHARED);

	ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE ||
@@ -406,7 +403,7 @@ xfs_map_blocks( 
	end_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + count);

	offset_fsb = XFS_B_TO_FSBT(mp, offset);

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

				imap, &nimaps, bmapi_flags);

				imap, &nimaps, XFS_BMAPI_ENTIRE);

	/*

	 * Truncate an overwrite extent if there's a pending CoW

	 * reservation before the end of this extent.  This forces us