From: Peter Watkins <treestem@gmail.com>
Date: Thu, 2 Aug 2012 22:27:16 +0000 (-0500)
Subject: xfs_db: bmap dump uses wrong btree key/ptr macro
X-Git-Tag: v3.1.9-rc1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7db1e7b9f8af12bc5ad2e98c723ba1c4d0cd30ec;p=thirdparty%2Fxfsprogs-dev.git

xfs_db: bmap dump uses wrong btree key/ptr macro

When dumping the bmap with extents in btree form, the traversal
code should use XFS_BMBT_ macros instead of XFS_BMDR_ macros to
access the key and pointer fields below the root node.

Signed-off-by: Peter Watkins <treestem@gmail.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/db/bmap.c b/db/bmap.c
index ddad49c96..0ef7a62cd 100644
--- a/db/bmap.c
+++ b/db/bmap.c
@@ -101,9 +101,9 @@ bmap(
 			block = (struct xfs_btree_block *)iocur_top->data;
 			if (be16_to_cpu(block->bb_level) == 0)
 				break;
-			pp = XFS_BMDR_PTR_ADDR(block, 1,
+			pp = XFS_BMBT_PTR_ADDR(mp, block, 1,
 				xfs_bmbt_maxrecs(mp, mp->m_sb.sb_blocksize, 0));
-			kp = XFS_BMDR_KEY_ADDR(block, 1);
+			kp = XFS_BMBT_KEY_ADDR(mp, block, 1);
 			bno = select_child(curoffset, kp, pp,
 					be16_to_cpu(block->bb_numrecs));
 		}