On Wed, Mar 11, 2020 at 08:45:27PM -0700, Darrick J. Wong wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> 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: Dave Chinner <dchinner@xxxxxxxxxx>
> Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/libxfs/xfs_alloc.c | 14 +++++++-------
> fs/xfs/libxfs/xfs_alloc_btree.c | 2 +-
> fs/xfs/libxfs/xfs_btree.h | 25 +++++++++++--------------
> fs/xfs/libxfs/xfs_refcount.c | 24 ++++++++++++------------
> fs/xfs/libxfs/xfs_refcount_btree.c | 4 ++--
> 5 files changed, 33 insertions(+), 36 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
> index 10ed68dfef5d..337822115bbc 100644
> --- a/fs/xfs/libxfs/xfs_alloc.c
> +++ b/fs/xfs/libxfs/xfs_alloc.c
> @@ -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;
> }
> diff --git a/fs/xfs/libxfs/xfs_alloc_btree.c b/fs/xfs/libxfs/xfs_alloc_btree.c
> index 92d30c19519d..a28041fdf4c0 100644
> --- a/fs/xfs/libxfs/xfs_alloc_btree.c
> +++ b/fs/xfs/libxfs/xfs_alloc_btree.c
> @@ -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;
> diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h
> index 9884f543eb51..0d10bbd5223a 100644
> --- a/fs/xfs/libxfs/xfs_btree.h
> +++ b/fs/xfs/libxfs/xfs_btree.h
> @@ -177,22 +177,19 @@ union xfs_btree_irec {
> struct xfs_refcount_irec rc;
> };
>
> -/* Per-AG btree private information. */
> -union xfs_btree_cur_private {
> - struct {
> - unsigned long nr_ops; /* # record updates */
> - int shape_changes; /* # of extent splits */
> - } refc;
> - struct {
> - 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;
> + struct xfs_buf *agbp;
> + xfs_agnumber_t agno;
> + union {
> + struct {
> + unsigned long nr_ops; /* # record updates */
> + int shape_changes; /* # of extent splits */
> + } refc;
> + struct {
> + bool active; /* allocation cursor state */
> + } abt;
> + };
> };
>
> /* Btree-in-inode cursor information */
> diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c
> index ef3e706f1d94..2076627243b0 100644
> --- a/fs/xfs/libxfs/xfs_refcount.c
> +++ b/fs/xfs/libxfs/xfs_refcount.c
> @@ -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;
>
> diff --git a/fs/xfs/libxfs/xfs_refcount_btree.c b/fs/xfs/libxfs/xfs_refcount_btree.c
> index bf1a4cb3c7ac..e07a2c45f8ec 100644
> --- a/fs/xfs/libxfs/xfs_refcount_btree.c
> +++ b/fs/xfs/libxfs/xfs_refcount_btree.c
> @@ -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;
> }
>
