[XFS] Use the same btree_cur union member for alloc and inobt trees.

The alloc and inobt btree use the same agbp/agno pair in the btree_cur
union. Make them use the same bc_private.a union member so that code for
these two short form btree implementations can be shared.

SGI-PV: 981498

SGI-Modid: xfs-linux-melb:xfs-kern:31788a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Signed-off-by: David Chinner <david@fromorbit.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/fs/xfs/xfs_btree.c b/fs/xfs/xfs_btree.c
index 2b0d454e92ec..cc593a84c345 100644
--- a/fs/xfs/xfs_btree.c
+++ b/fs/xfs/xfs_btree.c
@@ -570,6 +570,13 @@ xfs_btree_init_cursor(
                 cur->bc_private.a.agbp = agbp;
                 cur->bc_private.a.agno = agno;
                 break;
+        case XFS_BTNUM_INO:
+                /*
+                 * Inode allocation btree fields.
+                 */
+                cur->bc_private.a.agbp = agbp;
+                cur->bc_private.a.agno = agno;
+                break;
         case XFS_BTNUM_BMAP:
                 /*
                  * Bmap btree fields.
@@ -582,13 +589,6 @@ xfs_btree_init_cursor(
                 cur->bc_private.b.flags = 0;
                 cur->bc_private.b.whichfork = whichfork;
                 break;
-        case XFS_BTNUM_INO:
-                /*
-                 * Inode allocation btree fields.
-                 */
-                cur->bc_private.i.agbp = agbp;
-                cur->bc_private.i.agno = agno;
-                break;
         default:
                 ASSERT(0);
         }
@@ -863,12 +863,12 @@ xfs_btree_readahead_core(
         case XFS_BTNUM_INO:
                 i = XFS_BUF_TO_INOBT_BLOCK(cur->bc_bufs[lev]);
                 if ((lr & XFS_BTCUR_LEFTRA) && be32_to_cpu(i->bb_leftsib) != NULLAGBLOCK) {
-                        xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.i.agno,
+                        xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.a.agno,
                                 be32_to_cpu(i->bb_leftsib), 1);
                         rval++;
                 }
                 if ((lr & XFS_BTCUR_RIGHTRA) && be32_to_cpu(i->bb_rightsib) != NULLAGBLOCK) {
-                        xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.i.agno,
+                        xfs_btree_reada_bufs(cur->bc_mp, cur->bc_private.a.agno,
                                 be32_to_cpu(i->bb_rightsib), 1);
                         rval++;
                 }