From: Dave Chinner <dchinner@xxxxxxxxxx>
we need to name the btree cursor private structures to be able
to pull them out of the deeply nested structure definition they are
in now.
Based on code extracted from a patchset by Darrick Wong.
Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
fs/xfs/libxfs/xfs_btree.h | 36 +++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_btree.h b/fs/xfs/libxfs/xfs_btree.h
index 561b6c344a2c..22aa26463ac3 100644
--- a/fs/xfs/libxfs/xfs_btree.h
+++ b/fs/xfs/libxfs/xfs_btree.h
@@ -188,6 +188,24 @@ union xfs_btree_cur_private {
} abt;
};
+/* Per-AG btree information. */
+struct xfs_btree_cur_ag {
+ struct xfs_buf *agbp;
+ xfs_agnumber_t agno;
+ union xfs_btree_cur_private priv;
+};
+
+/* Btree-in-inode cursor information */
+struct xfs_btree_cur_bt {
+ struct xfs_inode *ip;
+ int allocated;
+ short forksize;
+ char whichfork;
+ char flags;
+#define XFS_BC_BT_WASDEL (1 << 0)
+#define XFS_BC_BT_INVALID_OWNER (1 << 1)
+};
+
/*
* Btree cursor structure.
* This collects all information needed by the btree code in one place.
@@ -209,21 +227,9 @@ typedef struct xfs_btree_cur
xfs_btnum_t bc_btnum; /* identifies which btree type */
int bc_statoff; /* offset of btre stats array */
union {
- struct { /* needed for BNO, CNT, INO */
- struct xfs_buf *agbp; /* agf/agi buffer pointer */
- xfs_agnumber_t agno; /* ag number */
- union xfs_btree_cur_private priv;
- } bc_ag;
- struct { /* needed for BMAP */
- struct xfs_inode *ip; /* pointer to our inode */
- int allocated; /* count of alloced */
- short forksize; /* fork's inode space */
- char whichfork; /* data or attr fork */
- char flags; /* flags */
-#define XFS_BC_BT_WASDEL (1 << 0) /* was delayed */
-#define XFS_BC_BT_INVALID_OWNER (1 << 1) /* for ext swap */
- } bc_bt;
- }; /* per-btree type data */
+ struct xfs_btree_cur_ag bc_ag;
+ struct xfs_btree_cur_bt bc_bt;
+ };
} xfs_btree_cur_t;
/* cursor flags */
--
2.24.0.rc0
