xfs: rearrange xfs_btree_cur fields for better packing

Source kernel commit: 69724d920e7c30ca4421af615c499e92cfcc550b

Reduce the size of the btree cursor structure some more by rearranging
fields to eliminate unused space.  While we're at it, fix the ragged
indentation and a spelling error.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h
index 0181fc98bc129fa62504f7213dffa788f312a4c0..eaffd8223ce679172e747b220bc3b2ee0e352206 100644 (file)
--- a/libxfs/xfs_btree.h
+++ b/libxfs/xfs_btree.h
@@ -234,11 +234,11 @@ struct xfs_btree_cur
        struct xfs_trans        *bc_tp; /* transaction we're in, if any */
        struct xfs_mount        *bc_mp; /* file system mount struct */
        const struct xfs_btree_ops *bc_ops;
-       uint                    bc_flags; /* btree features - below */
+       unsigned int            bc_flags; /* btree features - below */
+       xfs_btnum_t             bc_btnum; /* identifies which btree type */
        union xfs_btree_irec    bc_rec; /* current insert/search record value */
-       uint8_t         bc_nlevels;     /* number of levels in the tree */
-       xfs_btnum_t     bc_btnum;       /* identifies which btree type */
-       int             bc_statoff;     /* offset of btre stats array */
+       uint8_t                 bc_nlevels; /* number of levels in the tree */
+       int                     bc_statoff; /* offset of btree stats array */
 
        /*
         * Short btree pointers need an agno to be able to turn the pointers