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

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

xfs: remove the now unused XFS_BMAPI_IGSTATE flag 



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 e2f6ad46

fs/xfs/libxfs/xfs_bmap.c

+2 −4
Original line number Diff line number Diff line
@@ -3788,8 +3788,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;
@@ -3834,7 +3833,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(
@@ -4279,7 +4278,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));

fs/xfs/libxfs/xfs_bmap.h

+0 −3
Original line number Diff line number Diff line
@@ -68,8 +68,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
@@ -116,7 +114,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" }, \