Commit c4aa10d0 authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: make the btree ag cursor private union anonymous 



This is much less widely used than the bc_private union was, so this
is done as a single patch. The named union xfs_btree_cur_private
goes away and is embedded into the struct xfs_btree_cur_ag as an
anonymous union, and the code is modified via this script:

$ sed -i 's/priv\.\([abt|refc]\)/\1/g' fs/xfs/*[ch] fs/xfs/*/*[ch]

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 68422d90

fs/xfs/libxfs/xfs_alloc.c

+7 −7
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ xfs_alloc_lookup_eq( 
	cur->bc_rec.a.ar_startblock = bno;

	cur->bc_rec.a.ar_blockcount = len;

	error = xfs_btree_lookup(cur, XFS_LOOKUP_EQ, stat);

	cur->bc_ag.priv.abt.active = (*stat == 1);

	cur->bc_ag.abt.active = (*stat == 1);

	return error;

}
@@ -171,7 +171,7 @@ xfs_alloc_lookup_ge( 
	cur->bc_rec.a.ar_startblock = bno;

	cur->bc_rec.a.ar_blockcount = len;

	error = xfs_btree_lookup(cur, XFS_LOOKUP_GE, stat);

	cur->bc_ag.priv.abt.active = (*stat == 1);

	cur->bc_ag.abt.active = (*stat == 1);

	return error;

}
@@ -190,7 +190,7 @@ xfs_alloc_lookup_le( 
	cur->bc_rec.a.ar_startblock = bno;

	cur->bc_rec.a.ar_blockcount = len;

	error = xfs_btree_lookup(cur, XFS_LOOKUP_LE, stat);

	cur->bc_ag.priv.abt.active = (*stat == 1);

	cur->bc_ag.abt.active = (*stat == 1);

	return error;

}
@@ -198,7 +198,7 @@ static inline bool 
xfs_alloc_cur_active(

	struct xfs_btree_cur	*cur)

{

	return cur && cur->bc_ag.priv.abt.active;

	return cur && cur->bc_ag.abt.active;

}



/*
@@ -908,7 +908,7 @@ xfs_alloc_cur_check( 
		deactivate = true;

out:

	if (deactivate)

		cur->bc_ag.priv.abt.active = false;

		cur->bc_ag.abt.active = false;

	trace_xfs_alloc_cur_check(args->mp, cur->bc_btnum, bno, len, diff,

				  *new);

	return 0;
@@ -1352,7 +1352,7 @@ xfs_alloc_walk_iter( 
		if (error)

			return error;

		if (i == 0)

			cur->bc_ag.priv.abt.active = false;

			cur->bc_ag.abt.active = false;



		if (count > 0)

			count--;
@@ -1467,7 +1467,7 @@ xfs_alloc_ag_vextent_locality( 
		if (error)

			return error;

		if (i) {

			acur->cnt->bc_ag.priv.abt.active = true;

			acur->cnt->bc_ag.abt.active = true;

			fbcur = acur->cnt;

			fbinc = false;

		}

fs/xfs/libxfs/xfs_alloc_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ xfs_allocbt_init_cursor( 


	cur->bc_ag.agbp = agbp;

	cur->bc_ag.agno = agno;

	cur->bc_ag.priv.abt.active = false;

	cur->bc_ag.abt.active = false;



	if (xfs_sb_version_hascrc(&mp->m_sb))

		cur->bc_flags |= XFS_BTREE_CRC_BLOCKS;

fs/xfs/libxfs/xfs_btree.h

+11 −14
Original line number Diff line number Diff line
@@ -177,8 +177,11 @@ union xfs_btree_irec { 
	struct xfs_refcount_irec	rc;

};



/* Per-AG btree private information. */

union xfs_btree_cur_private {

/* Per-AG btree information. */

struct xfs_btree_cur_ag {

	struct xfs_buf		*agbp;

	xfs_agnumber_t		agno;

	union {

		struct {

			unsigned long nr_ops;	/* # record updates */

			int	shape_changes;	/* # of extent splits */
@@ -187,12 +190,6 @@ union xfs_btree_cur_private { 
			bool	active;		/* allocation cursor state */

		} abt;

	};



/* Per-AG btree information. */

struct xfs_btree_cur_ag {

	struct xfs_buf			*agbp;

	xfs_agnumber_t			agno;

	union xfs_btree_cur_private	priv;

};



/* Btree-in-inode cursor information */

fs/xfs/libxfs/xfs_refcount.c

+12 −12
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ xfs_refcount_still_have_space( 
{

	unsigned long			overhead;



	overhead = cur->bc_ag.priv.refc.shape_changes *

	overhead = cur->bc_ag.refc.shape_changes *

			xfs_allocfree_log_count(cur->bc_mp, 1);

	overhead *= cur->bc_mp->m_sb.sb_blocksize;
@@ -891,17 +891,17 @@ xfs_refcount_still_have_space( 
	 * Only allow 2 refcount extent updates per transaction if the

	 * refcount continue update "error" has been injected.

	 */

	if (cur->bc_ag.priv.refc.nr_ops > 2 &&

	if (cur->bc_ag.refc.nr_ops > 2 &&

	    XFS_TEST_ERROR(false, cur->bc_mp,

			XFS_ERRTAG_REFCOUNT_CONTINUE_UPDATE))

		return false;



	if (cur->bc_ag.priv.refc.nr_ops == 0)

	if (cur->bc_ag.refc.nr_ops == 0)

		return true;

	else if (overhead > cur->bc_tp->t_log_res)

		return false;

	return  cur->bc_tp->t_log_res - overhead >

		cur->bc_ag.priv.refc.nr_ops * XFS_REFCOUNT_ITEM_OVERHEAD;

		cur->bc_ag.refc.nr_ops * XFS_REFCOUNT_ITEM_OVERHEAD;

}



/*
@@ -968,7 +968,7 @@ xfs_refcount_adjust_extents( 
					error = -EFSCORRUPTED;

					goto out_error;

				}

				cur->bc_ag.priv.refc.nr_ops++;

				cur->bc_ag.refc.nr_ops++;

			} else {

				fsbno = XFS_AGB_TO_FSB(cur->bc_mp,

						cur->bc_ag.agno,
@@ -1003,7 +1003,7 @@ xfs_refcount_adjust_extents( 
			error = xfs_refcount_update(cur, &ext);

			if (error)

				goto out_error;

			cur->bc_ag.priv.refc.nr_ops++;

			cur->bc_ag.refc.nr_ops++;

		} else if (ext.rc_refcount == 1) {

			error = xfs_refcount_delete(cur, &found_rec);

			if (error)
@@ -1012,7 +1012,7 @@ xfs_refcount_adjust_extents( 
				error = -EFSCORRUPTED;

				goto out_error;

			}

			cur->bc_ag.priv.refc.nr_ops++;

			cur->bc_ag.refc.nr_ops++;

			goto advloop;

		} else {

			fsbno = XFS_AGB_TO_FSB(cur->bc_mp,
@@ -1088,7 +1088,7 @@ xfs_refcount_adjust( 
	if (shape_changed)

		shape_changes++;

	if (shape_changes)

		cur->bc_ag.priv.refc.shape_changes++;

		cur->bc_ag.refc.shape_changes++;



	/* Now that we've taken care of the ends, adjust the middle extents */

	error = xfs_refcount_adjust_extents(cur, new_agbno, new_aglen,
@@ -1166,8 +1166,8 @@ xfs_refcount_finish_one( 
	 */

	rcur = *pcur;

	if (rcur != NULL && rcur->bc_ag.agno != agno) {

		nr_ops = rcur->bc_ag.priv.refc.nr_ops;

		shape_changes = rcur->bc_ag.priv.refc.shape_changes;

		nr_ops = rcur->bc_ag.refc.nr_ops;

		shape_changes = rcur->bc_ag.refc.shape_changes;

		xfs_refcount_finish_one_cleanup(tp, rcur, 0);

		rcur = NULL;

		*pcur = NULL;
@@ -1183,8 +1183,8 @@ xfs_refcount_finish_one( 
			error = -ENOMEM;

			goto out_cur;

		}

		rcur->bc_ag.priv.refc.nr_ops = nr_ops;

		rcur->bc_ag.priv.refc.shape_changes = shape_changes;

		rcur->bc_ag.refc.nr_ops = nr_ops;

		rcur->bc_ag.refc.shape_changes = shape_changes;

	}

	*pcur = rcur;

fs/xfs/libxfs/xfs_refcount_btree.c

+2 −2
Original line number Diff line number Diff line
@@ -340,8 +340,8 @@ xfs_refcountbt_init_cursor( 
	cur->bc_ag.agno = agno;

	cur->bc_flags |= XFS_BTREE_CRC_BLOCKS;



	cur->bc_ag.priv.refc.nr_ops = 0;

	cur->bc_ag.priv.refc.shape_changes = 0;

	cur->bc_ag.refc.nr_ops = 0;

	cur->bc_ag.refc.shape_changes = 0;



	return cur;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE