[PATCH 5/7] xfs: make btree cursor private union anonymous

Dave Chinner
2020-03-05T01:45:40Z

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@redhat.com>
---
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 93063479264c..561b6c344a2c 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_BC_BT_WASDEL (1 << 0) /* was delayed */
#define XFS_BC_BT_INVALID_OWNER (1 << 1) /* for ext swap */
- } b;
- } bc_private; /* per-btree type data */
-#define bc_ag bc_private.a
-#define bc_bt bc_private.b
+ } bc_bt;
+ }; /* per-btree type data */
} xfs_btree_cur_t;

/* cursor flags */
--
2.24.0.rc0