Message ID | 20180531180759.21631-14-hch@lst.de (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
On Thu, May 31, 2018 at 08:07:51PM +0200, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> > --- Reviewed-by: Brian Foster <bfoster@redhat.com> > fs/xfs/libxfs/xfs_bmap.c | 6 ++---- > fs/xfs/libxfs/xfs_bmap.h | 3 --- > 2 files changed, 2 insertions(+), 7 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c > index 7b0e2b551e23..4b5e014417d2 100644 > --- a/fs/xfs/libxfs/xfs_bmap.c > +++ b/fs/xfs/libxfs/xfs_bmap.c > @@ -3799,8 +3799,7 @@ xfs_bmapi_update_map( > mval[-1].br_startblock != HOLESTARTBLOCK && > mval->br_startblock == mval[-1].br_startblock + > mval[-1].br_blockcount && > - ((flags & XFS_BMAPI_IGSTATE) || > - mval[-1].br_state == mval->br_state)) { > + mval[-1].br_state == mval->br_state) { > ASSERT(mval->br_startoff == > mval[-1].br_startoff + mval[-1].br_blockcount); > mval[-1].br_blockcount += mval->br_blockcount; > @@ -3845,7 +3844,7 @@ xfs_bmapi_read( > > ASSERT(*nmap >= 1); > ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK|XFS_BMAPI_ENTIRE| > - XFS_BMAPI_IGSTATE|XFS_BMAPI_COWFORK))); > + XFS_BMAPI_COWFORK))); > ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED|XFS_ILOCK_EXCL)); > > if (unlikely(XFS_TEST_ERROR( > @@ -4290,7 +4289,6 @@ xfs_bmapi_write( > > ASSERT(*nmap >= 1); > ASSERT(*nmap <= XFS_BMAP_MAX_NMAP); > - ASSERT(!(flags & XFS_BMAPI_IGSTATE)); > ASSERT(tp != NULL || > (flags & (XFS_BMAPI_CONVERT | XFS_BMAPI_COWFORK)) == > (XFS_BMAPI_CONVERT | XFS_BMAPI_COWFORK)); > diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h > index 2c233f9f1a26..a845fe57d1b5 100644 > --- a/fs/xfs/libxfs/xfs_bmap.h > +++ b/fs/xfs/libxfs/xfs_bmap.h > @@ -80,8 +80,6 @@ struct xfs_extent_free_item > #define XFS_BMAPI_METADATA 0x002 /* mapping metadata not user data */ > #define XFS_BMAPI_ATTRFORK 0x004 /* use attribute fork not data */ > #define XFS_BMAPI_PREALLOC 0x008 /* preallocation op: unwritten space */ > -#define XFS_BMAPI_IGSTATE 0x010 /* Ignore state - */ > - /* combine contig. space */ > #define XFS_BMAPI_CONTIG 0x020 /* must allocate only one extent */ > /* > * unwritten extent conversion - this needs write cache flushing and no additional > @@ -128,7 +126,6 @@ struct xfs_extent_free_item > { XFS_BMAPI_METADATA, "METADATA" }, \ > { XFS_BMAPI_ATTRFORK, "ATTRFORK" }, \ > { XFS_BMAPI_PREALLOC, "PREALLOC" }, \ > - { XFS_BMAPI_IGSTATE, "IGSTATE" }, \ > { XFS_BMAPI_CONTIG, "CONTIG" }, \ > { XFS_BMAPI_CONVERT, "CONVERT" }, \ > { XFS_BMAPI_ZERO, "ZERO" }, \ > -- > 2.17.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 7b0e2b551e23..4b5e014417d2 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -3799,8 +3799,7 @@ xfs_bmapi_update_map( mval[-1].br_startblock != HOLESTARTBLOCK && mval->br_startblock == mval[-1].br_startblock + mval[-1].br_blockcount && - ((flags & XFS_BMAPI_IGSTATE) || - mval[-1].br_state == mval->br_state)) { + mval[-1].br_state == mval->br_state) { ASSERT(mval->br_startoff == mval[-1].br_startoff + mval[-1].br_blockcount); mval[-1].br_blockcount += mval->br_blockcount; @@ -3845,7 +3844,7 @@ xfs_bmapi_read( ASSERT(*nmap >= 1); ASSERT(!(flags & ~(XFS_BMAPI_ATTRFORK|XFS_BMAPI_ENTIRE| - XFS_BMAPI_IGSTATE|XFS_BMAPI_COWFORK))); + XFS_BMAPI_COWFORK))); ASSERT(xfs_isilocked(ip, XFS_ILOCK_SHARED|XFS_ILOCK_EXCL)); if (unlikely(XFS_TEST_ERROR( @@ -4290,7 +4289,6 @@ xfs_bmapi_write( ASSERT(*nmap >= 1); ASSERT(*nmap <= XFS_BMAP_MAX_NMAP); - ASSERT(!(flags & XFS_BMAPI_IGSTATE)); ASSERT(tp != NULL || (flags & (XFS_BMAPI_CONVERT | XFS_BMAPI_COWFORK)) == (XFS_BMAPI_CONVERT | XFS_BMAPI_COWFORK)); diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h index 2c233f9f1a26..a845fe57d1b5 100644 --- a/fs/xfs/libxfs/xfs_bmap.h +++ b/fs/xfs/libxfs/xfs_bmap.h @@ -80,8 +80,6 @@ struct xfs_extent_free_item #define XFS_BMAPI_METADATA 0x002 /* mapping metadata not user data */ #define XFS_BMAPI_ATTRFORK 0x004 /* use attribute fork not data */ #define XFS_BMAPI_PREALLOC 0x008 /* preallocation op: unwritten space */ -#define XFS_BMAPI_IGSTATE 0x010 /* Ignore state - */ - /* combine contig. space */ #define XFS_BMAPI_CONTIG 0x020 /* must allocate only one extent */ /* * unwritten extent conversion - this needs write cache flushing and no additional @@ -128,7 +126,6 @@ struct xfs_extent_free_item { XFS_BMAPI_METADATA, "METADATA" }, \ { XFS_BMAPI_ATTRFORK, "ATTRFORK" }, \ { XFS_BMAPI_PREALLOC, "PREALLOC" }, \ - { XFS_BMAPI_IGSTATE, "IGSTATE" }, \ { XFS_BMAPI_CONTIG, "CONTIG" }, \ { XFS_BMAPI_CONVERT, "CONVERT" }, \ { XFS_BMAPI_ZERO, "ZERO" }, \