btrfs-progs: ins: dump-tree: Small updates for extent tree output

Print tree name instead of number to make output more readable.

Signed-off-by Misono Tomohiro <[email protected]>

---
 print-tree.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

print-tree.c +0 -0

index 90173c2b..8d551d09 100644

print-tree.c +0 -0

 			break;
 		case BTRFS_SHARED_BLOCK_REF_KEY:
 			printf("\t\tshared block backref parent %llu\n",

Quoted 12 lines · Misono Tomohiro

Print tree name instead of number to make output more readable.

Signed-off-by Misono Tomohiro <[email protected]>

---
 print-tree.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

print-tree.c +0 -0

index 90173c2b..8d551d09 100644

print-tree.c void print_extent_item(struct extent_buffer *eb, int slot, int metadata) · line 475

Quoted 8 lines

print-tree.c +3 -2

@@ -470,8 +470,9 @@ void print_extent_item(struct extent_buffer *eb, int slot, int metadata)
 		offset = btrfs_extent_inline_ref_offset(eb, iref);
 		switch (type) {
 		case BTRFS_TREE_BLOCK_REF_KEY:
-			printf("\t\ttree block backref root %llu\n",
-			       (unsigned long long)offset);
+			printf("\t\ttree block backref root ");
+			print_objectid(stdout, offset, 0);
+			printf("\n");

So this is a good change, yet one thing I'd like to know is if I'm inspecting the extent tree with say "btrfs inspect-internal dump-tree -t 2" and I see a record :

item 14 key (14540800 EXTENT_ITEM 4096) itemoff 15488 itemsize 53
refs 1 gen 12 flags DATA
extent data backref root 5 objectid 479 offset 0 count 1

it will in fact be "root FS_TREE" or some such.

I bee able to use the printed string as an argument to -t ? Because on one hand I as a user would like to make sense of the output I'm seeing (hence the string is welcomed) at the same time I'd like to know that i can reference the tree with -t option without having to go and figure out what's the numeric id?

Quoted 5 lines

print-tree.c +0 -0

 			break;
 		case BTRFS_SHARED_BLOCK_REF_KEY:
 			printf("\t\tshared block backref parent %llu\n",

Quoted 28 lines · Nikolay Borisov

Quoted 12 lines · Misono Tomohiro

Print tree name instead of number to make output more readable.

Signed-off-by Misono Tomohiro <[email protected]>

---
 print-tree.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

print-tree.c +0 -0

index 90173c2b..8d551d09 100644

print-tree.c void print_extent_item(struct extent_buffer *eb, int slot, int metadata) · line 475

Quoted 8 lines

print-tree.c +3 -2

@@ -470,8 +470,9 @@ void print_extent_item(struct extent_buffer *eb, int slot, int metadata)
 		offset = btrfs_extent_inline_ref_offset(eb, iref);
 		switch (type) {
 		case BTRFS_TREE_BLOCK_REF_KEY:
-			printf("\t\ttree block backref root %llu\n",
-			       (unsigned long long)offset);
+			printf("\t\ttree block backref root ");
+			print_objectid(stdout, offset, 0);
+			printf("\n");

So this is a good change, yet one thing I'd like to know is if I'm inspecting the extent tree with say "btrfs inspect-internal dump-tree -t 2" and I see a record :

Quoted 5 lines

item 14 key (14540800 EXTENT_ITEM 4096) itemoff 15488 itemsize 53
refs 1 gen 12 flags DATA
extent data backref root 5 objectid 479 offset 0 count 1

it will in fact be "root FS_TREE" or some such.

I overlooked it. So I will update the patch.

So the question is will

Quoted 5 lines

I bee able to use the printed string as an argument to -t ? Because on one hand I as a user would like to make sense of the output I'm seeing (hence the string is welcomed) at the same time I'd like to know that i can reference the tree with -t option without having to go and figure out what's the numeric id?

I looked the code and just now realized that we can already use tree name for -t like "btrfs ins dump-tree -t EXTNET $DEV".
Please see treeid_from_string() in inspect-dump-tree.c.

Quoted 8 lines

print-tree.c void print_extent_item(struct extent_buffer *eb, int slot, int metadata) · line 478

Quoted 6 lines

print-tree.c +0 -0

 			break;
 		case BTRFS_SHARED_BLOCK_REF_KEY:
 			printf("\t\tshared block backref parent %llu\n",

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Print tree name instead of number to make output more readable.

Example:
[before]
extent data backref root 5 objectid 257 offset 16384 count 1

   tree block backref root 18446744073709551607

[after]
extent data backref root FS_TREE objectid 257 offset 16384 count 1

tree block backref root DATA_RELOC_TREE

Signed-off-by Misono Tomohiro <[email protected]>

---
v1 -> v2
- Update extent data backref too
- Add output example

 print-tree.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

print-tree.c +11 -8

index 90173c2b..c5be5e6c 100644
@@ -470,8 +470,9 @@ void print_extent_item(struct extent_buffer *eb, int slot, int metadata)
 		offset = btrfs_extent_inline_ref_offset(eb, iref);
 		switch (type) {
 		case BTRFS_TREE_BLOCK_REF_KEY:
-			printf("\t\ttree block backref root %llu\n",
-			       (unsigned long long)offset);
+			printf("\t\ttree block backref root ");
+			print_objectid(stdout, offset, 0);
+			printf("\n");
 			break;
 		case BTRFS_SHARED_BLOCK_REF_KEY:
 			printf("\t\tshared block backref parent %llu\n",

@@ -479,9 +480,10 @@ void print_extent_item(struct extent_buffer *eb, int slot, int metadata)
 			break;
 		case BTRFS_EXTENT_DATA_REF_KEY:
 			dref = (struct btrfs_extent_data_ref *)(&iref->offset);
-			printf("\t\textent data backref root %llu "
-			       "objectid %llu offset %lld count %u\n",
-			       (unsigned long long)btrfs_extent_data_ref_root(eb, dref),
+			printf("\t\textent data backref root ");
+			print_objectid(stdout,
+		(unsigned long long)btrfs_extent_data_ref_root(eb, dref), 0);
+			printf(" objectid %llu offset %lld count %u\n",
 			       (unsigned long long)btrfs_extent_data_ref_objectid(eb, dref),
 			       btrfs_extent_data_ref_offset(eb, dref),
 			       btrfs_extent_data_ref_count(eb, dref));

@@ -1018,9 +1020,10 @@ static void print_extent_data_ref(struct extent_buffer *eb, int slot)
 	struct btrfs_extent_data_ref *dref;
 
 	dref = btrfs_item_ptr(eb, slot, struct btrfs_extent_data_ref);
-	printf("\t\textent data backref root %llu "
-		"objectid %llu offset %llu count %u\n",
-		(unsigned long long)btrfs_extent_data_ref_root(eb, dref),
+	printf("\t\textent data backref root ");
+	print_objectid(stdout,
+		(unsigned long long)btrfs_extent_data_ref_root(eb, dref), 0);
+	printf(" objectid %llu offset %llu count %u\n",
 		(unsigned long long)btrfs_extent_data_ref_objectid(eb, dref),
 		(unsigned long long)btrfs_extent_data_ref_offset(eb, dref),
 		btrfs_extent_data_ref_count(eb, dref));

Two small updates for extent tree to make output more human readable.

Misono Tomohiro (2):
btrfs-progs: ins: dump-tree: Use %lld for extent data backref offset
btrfs-progs: ins: dump-tree: Print tree name for tree block backref