From 352890735e52343b1690f6d5d32224e2aa88a56a Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Tue, 10 Mar 2020 17:54:38 -0700 Subject: [PATCH] xfs: make btree cursor private union anonymous 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 Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Reviewed-by: Brian Foster --- 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 */ -- GitLab