On Thu, Mar 12, 2020 at 03:45:14AM +0000, Darrick J. Wong wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> Rename the union and it's internal structures to the new name and
> remove the temporary defines that facilitated the change.
>
> 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_btree.h | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h
> index 00a58ac8b696..12a2bc93371d 100644
> --- a/fs/xfs/libxfs/xfs_btree.h
> +++ b/fs/xfs/libxfs/xfs_btree.h
> @@ -213,7 +213,7 @@ typedef struct xfs_btree_cur
> struct xfs_buf *agbp; /* agf/agi buffer pointer */
> xfs_agnumber_t agno; /* ag number */
> union xfs_btree_cur_private priv;
> - } a;
> + } bc_ag;
> struct { /* needed for BMAP */
> struct xfs_inode *ip; /* pointer to our inode */
> int allocated; /* count of alloced */
> @@ -222,10 +222,8 @@ typedef struct xfs_btree_cur
> char flags; /* flags */
> #define XFS_BTCUR_BMBT_WASDEL (1 << 0) /* was delayed */
> #define XFS_BTCUR_BMBT_INVALID_OWNER (1 << 1) /* for ext swap */
> - } b;
> - } bc_private; /* per-btree type data */
> -#define bc_ag bc_private.a
> -#define bc_ino bc_private.b
> + } bc_ino;
> + }; /* per-btree type data */
> } xfs_btree_cur_t;
>
> /* cursor flags */
>
