On Fri, Jun 15, 2018 at 03:01:54PM +0200, Christoph Hellwig wrote: > 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: Christoph Hellwig <hch@xxxxxx> > Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx> Looks ok, Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> --D > --- > fs/xfs/xfs_aops.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index 307ca66879b3..39b933e17192 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -385,7 +385,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)) > @@ -405,8 +404,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 || > @@ -418,7 +415,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 > -- > 2.17.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html
