btrfs-progs: check: original mode: Check inline extent size

[platform/upstream/btrfs-progs.git] / print-tree.c

diff --git a/print-tree.c b/print-tree.c
index d3fa862..d59f900 100644 (file)
--- a/print-tree.c
+++ b/print-tree.c
@@ -834,7 +834,16 @@ void btrfs_print_key(struct btrfs_disk_key *disk_key)
         */
        case BTRFS_ROOT_ITEM_KEY:
                printf(" ");
-               print_objectid(stdout, offset, type);
+               /*
+                * Normally offset of ROOT_ITEM should present the generation
+                * of creation time of the root.
+                * However if this is reloc tree, offset is the subvolume
+                * id of its source. Here we do extra check on this.
+                */
+               if (objectid == BTRFS_TREE_RELOC_OBJECTID)
+                       print_objectid(stdout, offset, type);
+               else
+                       printf("%lld", offset);
                printf(")");
                break;
        default:
@@ -919,8 +928,8 @@ static void print_inode_item(struct extent_buffer *eb,
               btrfs_inode_uid(eb, ii),
               btrfs_inode_gid(eb, ii),
               (unsigned long long)btrfs_inode_rdev(eb,ii),
-              (unsigned long long)btrfs_inode_flags(eb,ii),
               (unsigned long long)btrfs_inode_sequence(eb, ii),
+              (unsigned long long)btrfs_inode_flags(eb,ii),
               flags_str);
        print_timespec(eb, btrfs_inode_atime(ii), "\t\tatime ", "\n");
        print_timespec(eb, btrfs_inode_ctime(ii), "\t\tctime ", "\n");
@@ -1359,7 +1368,7 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int fol
        printf("node %llu level %d items %d free %u generation %llu owner %llu\n",
               (unsigned long long)eb->start,
                btrfs_header_level(eb), nr,
-               (u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr,
+               (u32)BTRFS_NODEPTRS_PER_BLOCK(root->fs_info) - nr,
                (unsigned long long)btrfs_header_generation(eb),
                (unsigned long long)btrfs_header_owner(eb));
        print_uuids(eb);
@@ -1389,19 +1398,16 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int fol
                                (unsigned long long)btrfs_header_owner(eb));
                        continue;
                }
-               if (btrfs_is_leaf(next) && btrfs_header_level(eb) != 1) {
-                       warning(
-       "eb corrupted: item %d eb level %d next level %d, skipping the rest",
-                               i, btrfs_header_level(next),
-                               btrfs_header_level(eb));
-                       goto out;
-               }
                if (btrfs_header_level(next) != btrfs_header_level(eb) - 1) {
                        warning(
-       "eb corrupted: item %d eb level %d next level %d, skipping the rest",
-                               i, btrfs_header_level(next),
-                               btrfs_header_level(eb));
-                       goto out;
+"eb corrupted: parent bytenr %llu slot %d level %d child bytenr %llu level has %d expect %d, skipping the slot",
+                               btrfs_header_bytenr(eb), i,
+                               btrfs_header_level(eb),
+                               btrfs_header_bytenr(next),
+                               btrfs_header_level(next),
+                               btrfs_header_level(eb) - 1);
+                       free_extent_buffer(next);
+                       continue;
                }
                btrfs_print_tree(root, next, 1);
                free_extent_buffer(next);
@@ -1409,6 +1415,5 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int fol
 
        return;
 
-out:
        free_extent_buffer(next);
 }