xfs: make full use of xfs_btree_stage_ifakeroot in xfs_bmbt_stage_cursor

Source kernel commit: 579d7022d1afea8f4475d1750224ec0b652febee

Remove the duplicate cur->bc_nlevels assignment in xfs_bmbt_stage_cursor,
and move the cur->bc_ino.forksize assignment into
xfs_btree_stage_ifakeroot as it is part of setting up the fake btree
root.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
index 611f5ed962bd875fc56b7fee00d21eb8d5c22d98..dedc33dc5049a160a44dd949533f3e4798dc4b23 100644 (file)
--- a/libxfs/xfs_bmap_btree.c
+++ b/libxfs/xfs_bmap_btree.c
@@ -611,8 +611,6 @@ xfs_bmbt_stage_cursor(
 
        /* data fork always has larger maxheight */
        cur = xfs_bmbt_init_common(mp, NULL, ip, XFS_DATA_FORK);
-       cur->bc_nlevels = ifake->if_levels;
-       cur->bc_ino.forksize = ifake->if_fork_size;
 
        /* Don't let anyone think we're attached to the real fork yet. */
        cur->bc_ino.whichfork = -1;

diff --git a/libxfs/xfs_btree_staging.c b/libxfs/xfs_btree_staging.c
index 5a988a8bfdd264268266291ba6d976a030586386..52410fe4f2e4509b7980faa7b301d3c894df7da5 100644 (file)
--- a/libxfs/xfs_btree_staging.c
+++ b/libxfs/xfs_btree_staging.c
@@ -133,6 +133,7 @@ xfs_btree_stage_ifakeroot(
 
        cur->bc_ino.ifake = ifake;
        cur->bc_nlevels = ifake->if_levels;
+       cur->bc_ino.forksize = ifake->if_fork_size;
        cur->bc_flags |= XFS_BTREE_STAGING;
 }