commit f5efb4e3ff77b7b25459b908e1b344c043fb94c6
author Darrick J. Wong <djwong@kernel.org> Tue Jul 29 16:02:29 2025 -0700
committer Darrick J. Wong <djwong@kernel.org> Tue Sep 30 13:27:42 2025 -0700
tree 6c5bc2d496604656fac11092b38e07eafa29f377
parent 1ac6353e557960e9683891b9c4c75f5126b62337

xfs_db: add merkle tree geometry calculations

Amend the btheight debugger command so that we can compute merkle tree
geometry for fsverity.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>

db/btheight.c

diff --git a/db/btheight.c b/db/btheight.c
index 14081c9..cfac3ea 100644
--- a/db/btheight.c
+++ b/db/btheight.c
@@ -204,10 +204,6 @@
 		perror(p);
 		goto out;
 	}
-	if (ptr_size == 0) {
-		fprintf(stderr, _("%s: pointer size cannot be zero.\n"), tag);
-		goto out;
-	}
 
 	p = strtok(NULL, ":");
 	if (!p) {
@@ -222,8 +218,10 @@
 		blocksize -= XFS_BTREE_LBLOCK_LEN;
 	else if (!strcmp(p, "longcrc"))
 		blocksize -= XFS_BTREE_LBLOCK_CRC_LEN;
+	else if (!strcmp(p, "merkle"))
+		; /* no header */
 	else {
-		fprintf(stderr, _("%s: unrecognized btree header type."),
+		fprintf(stderr, _("%s: unrecognized btree header type.\n"),
 				p);
 		goto out;
 	}