summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2020-03-10 17:54:38 -0700
committerDarrick J. Wong <darrick.wong@oracle.com>2020-03-13 10:37:14 -0700
commit352890735e52343b1690f6d5d32224e2aa88a56a (patch)
tree60f2e66e64c131c5f87e54c2311429e7dfdebfde
parent8ef547976a18e3d672194d8c944c19b345ef6bfc (diff)
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 <dchinner@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Brian Foster <bfoster@redhat.com>
-rw-r--r--fs/xfs/libxfs/xfs_btree.h8
1 files 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 */