[PATCH v2 20/20] xfsprogs/db: add finobt support to metadump

Brian Foster
2013-11-13T15:56:26Z

Include the free inode btree in metadump images. If the source fs
is finobt-enabled, run an additional scan_btree() of the finobt.
Since the private 'agi' scanfunc_ino() parameter is unused, change
the private parameter to a flag that indicates whether the current
scan is for the inobt or finobt. If the latter, we skip copying the
actual inode chunks as this work is already performed by the inobt
scan.

Signed-off-by: Brian Foster <bfoster@redhat.com>
---
db/metadump.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/db/metadump.c b/db/metadump.c
index 117dc42..bb52caf 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -1776,6 +1776,7 @@ scanfunc_ino(
xfs_inobt_ptr_t *pp;
int i;
int numrecs;
+ int finobt = *(int *) arg;

numrecs = be16_to_cpu(block->bb_numrecs);

@@ -1787,6 +1788,14 @@ scanfunc_ino(
typtab[btype].name, agno, agbno);
numrecs = mp->m_inobt_mxr[0];
}
+
+ /*
+ * Only copy the btree blocks for the finobt. The inobt scan
+ * copies the inode chunks.
+ */
+ if (finobt)
+ return 1;
+
rp = XFS_INOBT_REC_ADDR(mp, block, 1);
for (i = 0; i < numrecs; i++, rp++) {
if (!copy_inode_chunk(agno, rp))
@@ -1826,6 +1835,7 @@ copy_inodes(
{
xfs_agblock_t root;
int levels;
+ int finobt = 0;

root = be32_to_cpu(agi->agi_root);
levels = be32_to_cpu(agi->agi_level);
@@ -1844,7 +1854,20 @@ copy_inodes(
return 1;
}

- return scan_btree(agno, root, levels, TYP_INOBT, agi, scanfunc_ino);
+ if (!scan_btree(agno, root, levels, TYP_INOBT, &finobt, scanfunc_ino))
+ return 0;
+
+ if (xfs_sb_version_hasfinobt(&mp->m_sb)) {
+ root = be32_to_cpu(agi->agi_free_root);
+ levels = be32_to_cpu(agi->agi_free_level);
+
+ finobt = 1;
+ if (!scan_btree(agno, root, levels, TYP_INOBT, &finobt,
+ scanfunc_ino))
+ return 0;
+ }
+
+ return 1;
}

static int