xfs: make btree cursor private union anonymous

Source kernel commit: 352890735e52343b1690f6d5d32224e2aa88a56a

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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
index 33980a12f25c22fc56fdf24128b125bbb68b6c5e..337fb1d0ebbef678c65d055543b1d687766b9131 100644 (file)
--- a/libxfs/xfs_btree.h
+++ b/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 */