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

xfs: remove XFS_IFBROOT 



Just check for a btree format fork instead of the using the equivalent
in-memory XFS_IFBROOT flag.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 0eba048d

fs/xfs/libxfs/xfs_bmap.c

+7 −9
Original line number Diff line number Diff line
@@ -633,7 +633,6 @@ xfs_bmap_btree_to_extents( 
		cur->bc_bufs[0] = NULL;

	xfs_iroot_realloc(ip, -1, whichfork);

	ASSERT(ifp->if_broot == NULL);

	ASSERT((ifp->if_flags & XFS_IFBROOT) == 0);

	ifp->if_format = XFS_DINODE_FMT_EXTENTS;

	*logflagsp |= XFS_ILOG_CORE | xfs_ilog_fext(whichfork);

	return 0;
@@ -677,7 +676,6 @@ xfs_bmap_extents_to_btree( 
	 * to expand the root.

	 */

	xfs_iroot_realloc(ip, 1, whichfork);

	ifp->if_flags |= XFS_IFBROOT;



	/*

	 * Fill in the root.
@@ -4196,7 +4194,7 @@ xfs_bmapi_allocate( 
			return error;

	}



	if ((ifp->if_flags & XFS_IFBROOT) && !bma->cur)

	if (ifp->if_format == XFS_DINODE_FMT_BTREE && !bma->cur)

		bma->cur = xfs_bmbt_init_cursor(mp, bma->tp, bma->ip, whichfork);

	/*

	 * Bump the number of extents we've allocated
@@ -4269,7 +4267,7 @@ xfs_bmapi_convert_unwritten( 
	 * Modify (by adding) the state flag, if writing.

	 */

	ASSERT(mval->br_blockcount <= len);

	if ((ifp->if_flags & XFS_IFBROOT) && !bma->cur) {

	if (ifp->if_format == XFS_DINODE_FMT_BTREE && !bma->cur) {

		bma->cur = xfs_bmbt_init_cursor(bma->ip->i_mount, bma->tp,

					bma->ip, whichfork);

	}
@@ -4732,7 +4730,7 @@ xfs_bmapi_remap( 
	ip->i_nblocks += len;

	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);



	if (ifp->if_flags & XFS_IFBROOT) {

	if (ifp->if_format == XFS_DINODE_FMT_BTREE) {

		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

		cur->bc_ino.flags = 0;

	}
@@ -5411,7 +5409,7 @@ __xfs_bunmapi( 
	end--;



	logflags = 0;

	if (ifp->if_flags & XFS_IFBROOT) {

	if (ifp->if_format == XFS_DINODE_FMT_BTREE) {

		ASSERT(ifp->if_format == XFS_DINODE_FMT_BTREE);

		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

		cur->bc_ino.flags = 0;
@@ -5885,7 +5883,7 @@ xfs_bmap_collapse_extents( 
	if (error)

		return error;



	if (ifp->if_flags & XFS_IFBROOT) {

	if (ifp->if_format == XFS_DINODE_FMT_BTREE) {

		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

		cur->bc_ino.flags = 0;

	}
@@ -6000,7 +5998,7 @@ xfs_bmap_insert_extents( 
	if (error)

		return error;



	if (ifp->if_flags & XFS_IFBROOT) {

	if (ifp->if_format == XFS_DINODE_FMT_BTREE) {

		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

		cur->bc_ino.flags = 0;

	}
@@ -6115,7 +6113,7 @@ xfs_bmap_split_extent( 
	new.br_blockcount = got.br_blockcount - gotblkcnt;

	new.br_state = got.br_state;



	if (ifp->if_flags & XFS_IFBROOT) {

	if (ifp->if_format == XFS_DINODE_FMT_BTREE) {

		cur = xfs_bmbt_init_cursor(mp, tp, ip, whichfork);

		cur->bc_ino.flags = 0;

		error = xfs_bmbt_lookup_eq(cur, &got, &i);

fs/xfs/libxfs/xfs_btree_staging.c

+0 −1
Original line number Diff line number Diff line
@@ -387,7 +387,6 @@ xfs_btree_bload_prep_block( 
		new_size = bbl->iroot_size(cur, nr_this_block, priv);

		ifp->if_broot = kmem_zalloc(new_size, 0);

		ifp->if_broot_bytes = (int)new_size;

		ifp->if_flags |= XFS_IFBROOT;



		/* Initialize it and send it out. */

		xfs_btree_init_block_int(cur->bc_mp, ifp->if_broot,

fs/xfs/libxfs/xfs_inode_fork.c

+1 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ xfs_init_local_fork( 
	}



	ifp->if_bytes = size;

	ifp->if_flags &= ~(XFS_IFEXTENTS | XFS_IFBROOT);

	ifp->if_flags &= ~XFS_IFEXTENTS;

	ifp->if_flags |= XFS_IFINLINE;

}
@@ -214,7 +214,6 @@ xfs_iformat_btree( 
	xfs_bmdr_to_bmbt(ip, dfp, XFS_DFORK_SIZE(dip, ip->i_mount, whichfork),

			 ifp->if_broot, size);

	ifp->if_flags &= ~XFS_IFEXTENTS;

	ifp->if_flags |= XFS_IFBROOT;



	ifp->if_bytes = 0;

	ifp->if_u1.if_root = NULL;
@@ -433,7 +432,6 @@ xfs_iroot_realloc( 
			XFS_BMBT_BLOCK_LEN(ip->i_mount));

	} else {

		new_broot = NULL;

		ifp->if_flags &= ~XFS_IFBROOT;

	}



	/*

fs/xfs/libxfs/xfs_inode_fork.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ struct xfs_ifork { 
 */

#define	XFS_IFINLINE	0x01	/* Inline data is read in */

#define	XFS_IFEXTENTS	0x02	/* All extent pointers are read in */

#define	XFS_IFBROOT	0x04	/* i_broot points to the bmap b-tree root */



/*

 * Worst-case increase in the fork extent count when we're adding a single