btrfs-progs: convert/ext2: Remove check for ext2_ext_attr_entry->e_value_block
[platform/upstream/btrfs-progs.git] / print-tree.c
index 4ecf100..45350fe 100644 (file)
@@ -31,35 +31,21 @@ static void print_dir_item_type(struct extent_buffer *eb,
                                 struct btrfs_dir_item *di)
 {
        u8 type = btrfs_dir_type(eb, di);
+       static const char* dir_item_str[] = {
+               [BTRFS_FT_REG_FILE]     = "FILE",
+               [BTRFS_FT_DIR]          = "DIR",
+               [BTRFS_FT_CHRDEV]       = "CHRDEV",
+               [BTRFS_FT_BLKDEV]       = "BLKDEV",
+               [BTRFS_FT_FIFO]         = "FIFO",
+               [BTRFS_FT_SOCK]         = "SOCK",
+               [BTRFS_FT_SYMLINK]      = "SYMLINK",
+               [BTRFS_FT_XATTR]        = "XATTR"
+       };
 
-       switch (type) {
-       case BTRFS_FT_REG_FILE:
-               printf("FILE");
-               break;
-       case BTRFS_FT_DIR:
-               printf("DIR");
-               break;
-       case BTRFS_FT_CHRDEV:
-               printf("CHRDEV");
-               break;
-       case BTRFS_FT_BLKDEV:
-               printf("BLKDEV");
-               break;
-       case BTRFS_FT_FIFO:
-               printf("FIFO");
-               break;
-       case BTRFS_FT_SOCK:
-               printf("SOCK");
-               break;
-       case BTRFS_FT_SYMLINK:
-               printf("SYMLINK");
-               break;
-       case BTRFS_FT_XATTR:
-               printf("XATTR");
-               break;
-       default:
-               printf("%u", type);
-       }
+       if (type < ARRAY_SIZE(dir_item_str) && dir_item_str[type])
+               printf("%s", dir_item_str[type]);
+       else
+               printf("DIR_ITEM.%u", type);
 }
 
 static void print_dir_item(struct extent_buffer *eb, u32 size,
@@ -118,8 +104,7 @@ static void print_inode_extref_item(struct extent_buffer *eb, u32 size,
 
                read_extent_buffer(eb, namebuf, (unsigned long)(extref->name), len);
 
-               printf("\t\tinode extref index %llu parent %llu namelen %u "
-                      "name: %.*s\n",
+               printf("\t\tindex %llu parent %llu namelen %u name: %.*s\n",
                       (unsigned long long)index,
                       (unsigned long long)parent_objid,
                       name_len, len, namebuf);
@@ -144,7 +129,7 @@ static void print_inode_ref_item(struct extent_buffer *eb, u32 size,
                index = btrfs_inode_ref_index(eb, ref);
                len = (name_len <= sizeof(namebuf))? name_len: sizeof(namebuf);
                read_extent_buffer(eb, namebuf, (unsigned long)(ref + 1), len);
-               printf("\t\tinode ref index %llu namelen %u name: %.*s\n",
+               printf("\t\tindex %llu namelen %u name: %.*s\n",
                       (unsigned long long)index, name_len, len, namebuf);
                len = sizeof(*ref) + name_len;
                ref = (struct btrfs_inode_ref *)((char *)ref + len);
@@ -209,12 +194,26 @@ static void qgroup_flags_to_str(u64 flags, char *ret)
                strcat(ret, "|INCONSISTENT");
 }
 
-void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk)
+void print_chunk_item(struct extent_buffer *eb, struct btrfs_chunk *chunk)
 {
-       int num_stripes = btrfs_chunk_num_stripes(eb, chunk);
+       u16 num_stripes = btrfs_chunk_num_stripes(eb, chunk);
        int i;
+       u32 chunk_item_size;
        char chunk_flags_str[32] = {0};
 
+       /* The chunk must contain at least one stripe */
+       if (num_stripes < 1) {
+               printf("invalid num_stripes: %u\n", num_stripes);
+               return;
+       }
+
+       chunk_item_size = btrfs_chunk_item_size(num_stripes);
+
+       if ((unsigned long)chunk + chunk_item_size > eb->len) {
+               printf("\t\tchunk item invalid\n");
+               return;
+       }
+
        bg_flags_to_str(btrfs_chunk_type(eb, chunk), chunk_flags_str);
        printf("\t\tlength %llu owner %llu stripe_len %llu type %s\n",
               (unsigned long long)btrfs_chunk_length(eb, chunk),
@@ -230,9 +229,21 @@ void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk)
        for (i = 0 ; i < num_stripes ; i++) {
                unsigned char dev_uuid[BTRFS_UUID_SIZE];
                char str_dev_uuid[BTRFS_UUID_UNPARSED_SIZE];
+               u64 uuid_offset;
+               u64 stripe_offset;
+
+               uuid_offset = (unsigned long)btrfs_stripe_dev_uuid_nr(chunk, i);
+               stripe_offset = (unsigned long)btrfs_stripe_nr(chunk, i);
+
+               if (uuid_offset < stripe_offset ||
+                       (uuid_offset + BTRFS_UUID_SIZE) >
+                               (stripe_offset + sizeof(struct btrfs_stripe))) {
+                       printf("\t\t\tstripe %d invalid\n", i);
+                       break;
+               }
 
                read_extent_buffer(eb, dev_uuid,
-                       (unsigned long)btrfs_stripe_dev_uuid_nr(chunk, i),
+                       uuid_offset,
                        BTRFS_UUID_SIZE);
                uuid_unparse(dev_uuid, str_dev_uuid);
                printf("\t\t\tstripe %d devid %llu offset %llu\n", i,
@@ -312,6 +323,9 @@ static void compress_type_to_str(u8 compress_type, char *ret)
        case BTRFS_COMPRESS_LZO:
                strcpy(ret, "lzo");
                break;
+       case BTRFS_COMPRESS_ZSTD:
+               strcpy(ret, "zstd");
+               break;
        default:
                sprintf(ret, "UNKNOWN.%d", compress_type);
        }
@@ -332,7 +346,7 @@ static void print_file_extent_item(struct extent_buffer *eb,
                                   int slot,
                                   struct btrfs_file_extent_item *fi)
 {
-       int extent_type = btrfs_file_extent_type(eb, fi);
+       unsigned char extent_type = btrfs_file_extent_type(eb, fi);
        char compress_str[16];
 
        compress_type_to_str(btrfs_file_extent_compression(eb, fi),
@@ -413,7 +427,7 @@ void print_extent_item(struct extent_buffer *eb, int slot, int metadata)
                struct btrfs_extent_item_v0 *ei0;
                BUG_ON(item_size != sizeof(*ei0));
                ei0 = btrfs_item_ptr(eb, slot, struct btrfs_extent_item_v0);
-               printf("\t\textent refs %u\n",
+               printf("\t\trefs %u\n",
                       btrfs_extent_refs_v0(eb, ei0));
                return;
 #else
@@ -425,7 +439,7 @@ void print_extent_item(struct extent_buffer *eb, int slot, int metadata)
        flags = btrfs_extent_flags(eb, ei);
        extent_flags_to_str(flags, flags_str);
 
-       printf("\t\textent refs %llu gen %llu flags %s\n",
+       printf("\t\trefs %llu gen %llu flags %s\n",
               (unsigned long long)btrfs_extent_refs(eb, ei),
               (unsigned long long)btrfs_extent_generation(eb, ei),
               flags_str);
@@ -501,7 +515,7 @@ static void print_extent_ref_v0(struct extent_buffer *eb, int slot)
 }
 #endif
 
-static void print_root_ref(struct extent_buffer *leaf, int slot, char *tag)
+static void print_root_ref(struct extent_buffer *leaf, int slot, const char *tag)
 {
        struct btrfs_root_ref *ref;
        char namebuf[BTRFS_NAME_LEN];
@@ -537,7 +551,27 @@ static void root_flags_to_str(u64 flags, char *ret)
                strcat(ret, "none");
 }
 
-static void print_root(struct extent_buffer *leaf, int slot)
+static void print_timespec(struct extent_buffer *eb,
+               struct btrfs_timespec *timespec, const char *prefix,
+               const char *suffix)
+{
+       struct tm tm;
+       u64 tmp_u64;
+       u32 tmp_u32;
+       time_t tmp_time;
+       char timestamp[256];
+
+       tmp_u64 = btrfs_timespec_sec(eb, timespec);
+       tmp_u32 = btrfs_timespec_nsec(eb, timespec);
+       tmp_time = tmp_u64;
+       localtime_r(&tmp_time, &tm);
+       strftime(timestamp, sizeof(timestamp),
+                       "%Y-%m-%d %H:%M:%S", &tm);
+       printf("%s%llu.%u (%s)%s", prefix, (unsigned long long)tmp_u64, tmp_u32,
+                       timestamp, suffix);
+}
+
+static void print_root_item(struct extent_buffer *leaf, int slot)
 {
        struct btrfs_root_item *ri;
        struct btrfs_root_item root_item;
@@ -584,6 +618,18 @@ static void print_root(struct extent_buffer *leaf, int slot)
                                btrfs_root_stransid(&root_item),
                                btrfs_root_rtransid(&root_item));
                }
+               if (btrfs_timespec_sec(leaf, btrfs_root_ctime(ri)))
+                       print_timespec(leaf, btrfs_root_ctime(ri),
+                                       "\t\tctime ", "\n");
+               if (btrfs_timespec_sec(leaf, btrfs_root_otime(ri)))
+                       print_timespec(leaf, btrfs_root_otime(ri),
+                                       "\t\totime ", "\n");
+               if (btrfs_timespec_sec(leaf, btrfs_root_stime(ri)))
+                       print_timespec(leaf, btrfs_root_stime(ri),
+                                       "\t\tstime ", "\n");
+               if (btrfs_timespec_sec(leaf, btrfs_root_rtime(ri)))
+                       print_timespec(leaf, btrfs_root_rtime(ri),
+                                       "\t\trtime ", "\n");
        }
 
        btrfs_disk_key_to_cpu(&drop_key, &root_item.drop_progress);
@@ -610,132 +656,58 @@ static void print_free_space_header(struct extent_buffer *leaf, int slot)
 
 void print_key_type(FILE *stream, u64 objectid, u8 type)
 {
+       static const char* key_to_str[256] = {
+               [BTRFS_INODE_ITEM_KEY]          = "INODE_ITEM",
+               [BTRFS_INODE_REF_KEY]           = "INODE_REF",
+               [BTRFS_INODE_EXTREF_KEY]        = "INODE_EXTREF",
+               [BTRFS_DIR_ITEM_KEY]            = "DIR_ITEM",
+               [BTRFS_DIR_INDEX_KEY]           = "DIR_INDEX",
+               [BTRFS_DIR_LOG_ITEM_KEY]        = "DIR_LOG_ITEM",
+               [BTRFS_DIR_LOG_INDEX_KEY]       = "DIR_LOG_INDEX",
+               [BTRFS_XATTR_ITEM_KEY]          = "XATTR_ITEM",
+               [BTRFS_ORPHAN_ITEM_KEY]         = "ORPHAN_ITEM",
+               [BTRFS_ROOT_ITEM_KEY]           = "ROOT_ITEM",
+               [BTRFS_ROOT_REF_KEY]            = "ROOT_REF",
+               [BTRFS_ROOT_BACKREF_KEY]        = "ROOT_BACKREF",
+               [BTRFS_EXTENT_ITEM_KEY]         = "EXTENT_ITEM",
+               [BTRFS_METADATA_ITEM_KEY]       = "METADATA_ITEM",
+               [BTRFS_TREE_BLOCK_REF_KEY]      = "TREE_BLOCK_REF",
+               [BTRFS_SHARED_BLOCK_REF_KEY]    = "SHARED_BLOCK_REF",
+               [BTRFS_EXTENT_DATA_REF_KEY]     = "EXTENT_DATA_REF",
+               [BTRFS_SHARED_DATA_REF_KEY]     = "SHARED_DATA_REF",
+               [BTRFS_EXTENT_REF_V0_KEY]       = "EXTENT_REF_V0",
+               [BTRFS_CSUM_ITEM_KEY]           = "CSUM_ITEM",
+               [BTRFS_EXTENT_CSUM_KEY]         = "EXTENT_CSUM",
+               [BTRFS_EXTENT_DATA_KEY]         = "EXTENT_DATA",
+               [BTRFS_BLOCK_GROUP_ITEM_KEY]    = "BLOCK_GROUP_ITEM",
+               [BTRFS_FREE_SPACE_INFO_KEY]     = "FREE_SPACE_INFO",
+               [BTRFS_FREE_SPACE_EXTENT_KEY]   = "FREE_SPACE_EXTENT",
+               [BTRFS_FREE_SPACE_BITMAP_KEY]   = "FREE_SPACE_BITMAP",
+               [BTRFS_CHUNK_ITEM_KEY]          = "CHUNK_ITEM",
+               [BTRFS_DEV_ITEM_KEY]            = "DEV_ITEM",
+               [BTRFS_DEV_EXTENT_KEY]          = "DEV_EXTENT",
+               [BTRFS_TEMPORARY_ITEM_KEY]      = "TEMPORARY_ITEM",
+               [BTRFS_DEV_REPLACE_KEY]         = "DEV_REPLACE",
+               [BTRFS_STRING_ITEM_KEY]         = "STRING_ITEM",
+               [BTRFS_QGROUP_STATUS_KEY]       = "QGROUP_STATUS",
+               [BTRFS_QGROUP_RELATION_KEY]     = "QGROUP_RELATION",
+               [BTRFS_QGROUP_INFO_KEY]         = "QGROUP_INFO",
+               [BTRFS_QGROUP_LIMIT_KEY]        = "QGROUP_LIMIT",
+               [BTRFS_PERSISTENT_ITEM_KEY]     = "PERSISTENT_ITEM",
+               [BTRFS_UUID_KEY_SUBVOL]         = "UUID_KEY_SUBVOL",
+               [BTRFS_UUID_KEY_RECEIVED_SUBVOL] = "UUID_KEY_RECEIVED_SUBVOL",
+       };
+
        if (type == 0 && objectid == BTRFS_FREE_SPACE_OBJECTID) {
                fprintf(stream, "UNTYPED");
                return;
        }
 
-       switch (type) {
-       case BTRFS_INODE_ITEM_KEY:
-               fprintf(stream, "INODE_ITEM");
-               break;
-       case BTRFS_INODE_REF_KEY:
-               fprintf(stream, "INODE_REF");
-               break;
-       case BTRFS_INODE_EXTREF_KEY:
-               fprintf(stream, "INODE_EXTREF");
-               break;
-       case BTRFS_DIR_ITEM_KEY:
-               fprintf(stream, "DIR_ITEM");
-               break;
-       case BTRFS_DIR_INDEX_KEY:
-               fprintf(stream, "DIR_INDEX");
-               break;
-       case BTRFS_DIR_LOG_ITEM_KEY:
-               fprintf(stream, "DIR_LOG_ITEM");
-               break;
-       case BTRFS_DIR_LOG_INDEX_KEY:
-               fprintf(stream, "DIR_LOG_INDEX");
-               break;
-       case BTRFS_XATTR_ITEM_KEY:
-               fprintf(stream, "XATTR_ITEM");
-               break;
-       case BTRFS_ORPHAN_ITEM_KEY:
-               fprintf(stream, "ORPHAN_ITEM");
-               break;
-       case BTRFS_ROOT_ITEM_KEY:
-               fprintf(stream, "ROOT_ITEM");
-               break;
-       case BTRFS_ROOT_REF_KEY:
-               fprintf(stream, "ROOT_REF");
-               break;
-       case BTRFS_ROOT_BACKREF_KEY:
-               fprintf(stream, "ROOT_BACKREF");
-               break;
-       case BTRFS_EXTENT_ITEM_KEY:
-               fprintf(stream, "EXTENT_ITEM");
-               break;
-       case BTRFS_METADATA_ITEM_KEY:
-               fprintf(stream, "METADATA_ITEM");
-               break;
-       case BTRFS_TREE_BLOCK_REF_KEY:
-               fprintf(stream, "TREE_BLOCK_REF");
-               break;
-       case BTRFS_SHARED_BLOCK_REF_KEY:
-               fprintf(stream, "SHARED_BLOCK_REF");
-               break;
-       case BTRFS_EXTENT_DATA_REF_KEY:
-               fprintf(stream, "EXTENT_DATA_REF");
-               break;
-       case BTRFS_SHARED_DATA_REF_KEY:
-               fprintf(stream, "SHARED_DATA_REF");
-               break;
-       case BTRFS_EXTENT_REF_V0_KEY:
-               fprintf(stream, "EXTENT_REF_V0");
-               break;
-       case BTRFS_CSUM_ITEM_KEY:
-               fprintf(stream, "CSUM_ITEM");
-               break;
-       case BTRFS_EXTENT_CSUM_KEY:
-               fprintf(stream, "EXTENT_CSUM");
-               break;
-       case BTRFS_EXTENT_DATA_KEY:
-               fprintf(stream, "EXTENT_DATA");
-               break;
-       case BTRFS_BLOCK_GROUP_ITEM_KEY:
-               fprintf(stream, "BLOCK_GROUP_ITEM");
-               break;
-       case BTRFS_FREE_SPACE_INFO_KEY:
-               fprintf(stream, "FREE_SPACE_INFO");
-               break;
-       case BTRFS_FREE_SPACE_EXTENT_KEY:
-               fprintf(stream, "FREE_SPACE_EXTENT");
-               break;
-       case BTRFS_FREE_SPACE_BITMAP_KEY:
-               fprintf(stream, "FREE_SPACE_BITMAP");
-               break;
-       case BTRFS_CHUNK_ITEM_KEY:
-               fprintf(stream, "CHUNK_ITEM");
-               break;
-       case BTRFS_DEV_ITEM_KEY:
-               fprintf(stream, "DEV_ITEM");
-               break;
-       case BTRFS_DEV_EXTENT_KEY:
-               fprintf(stream, "DEV_EXTENT");
-               break;
-       case BTRFS_BALANCE_ITEM_KEY:
-               fprintf(stream, "BALANCE_ITEM");
-               break;
-       case BTRFS_DEV_REPLACE_KEY:
-               fprintf(stream, "DEV_REPLACE");
-               break;
-       case BTRFS_STRING_ITEM_KEY:
-               fprintf(stream, "STRING_ITEM");
-               break;
-       case BTRFS_QGROUP_STATUS_KEY:
-               fprintf(stream, "QGROUP_STATUS");
-               break;
-       case BTRFS_QGROUP_RELATION_KEY:
-               fprintf(stream, "QGROUP_RELATION");
-               break;
-       case BTRFS_QGROUP_INFO_KEY:
-               fprintf(stream, "QGROUP_INFO");
-               break;
-       case BTRFS_QGROUP_LIMIT_KEY:
-               fprintf(stream, "QGROUP_LIMIT");
-               break;
-       case BTRFS_DEV_STATS_KEY:
-               fprintf(stream, "DEV_STATS");
-               break;
-       case BTRFS_UUID_KEY_SUBVOL:
-               fprintf(stream, "UUID_KEY_SUBVOL");
-               break;
-       case BTRFS_UUID_KEY_RECEIVED_SUBVOL:
-               fprintf(stream, "UUID_KEY_RECEIVED_SUBVOL");
-               break;
-       default:
+
+       if (key_to_str[type])
+               fputs(key_to_str[type], stream);
+       else
                fprintf(stream, "UNKNOWN.%d", type);
-       };
 }
 
 void print_objectid(FILE *stream, u64 objectid, u8 type)
@@ -854,6 +826,17 @@ void btrfs_print_key(struct btrfs_disk_key *disk_key)
        case BTRFS_UUID_KEY_RECEIVED_SUBVOL:
                printf(" 0x%016llx)", (unsigned long long)offset);
                break;
+
+       /*
+        * Key offsets of ROOT_ITEM point to tree root, print them in human
+        * readable format.  Especially useful for trees like data/tree reloc
+        * tree, whose tree id can be negative.
+        */
+       case BTRFS_ROOT_ITEM_KEY:
+               printf(" ");
+               print_objectid(stdout, offset, type);
+               printf(")");
+               break;
        default:
                if (offset == (u64)-1)
                        printf(" -1)");
@@ -916,26 +899,6 @@ static void inode_flags_to_str(u64 flags, char *ret)
                strcat(ret, "none");
 }
 
-static void print_timespec(struct extent_buffer *eb,
-               struct btrfs_timespec *timespec, const char *prefix,
-               const char *suffix)
-{
-       struct tm tm;
-       u64 tmp_u64;
-       u32 tmp_u32;
-       time_t tmp_time;
-       char timestamp[256];
-
-       tmp_u64 = btrfs_timespec_sec(eb, timespec);
-       tmp_u32 = btrfs_timespec_nsec(eb, timespec);
-       tmp_time = tmp_u64;
-       localtime_r(&tmp_time, &tm);
-       strftime(timestamp, sizeof(timestamp),
-                       "%Y-%m-%d %H:%M:%S", &tm);
-       printf("%s%llu.%u (%s)%s", prefix, (unsigned long long)tmp_u64, tmp_u32,
-                       timestamp, suffix);
-}
-
 static void print_inode_item(struct extent_buffer *eb,
                struct btrfs_inode_item *ii)
 {
@@ -943,7 +906,7 @@ static void print_inode_item(struct extent_buffer *eb,
 
        memset(flags_str, 0, sizeof(flags_str));
        inode_flags_to_str(btrfs_inode_flags(eb, ii), flags_str);
-       printf("\t\tinode generation %llu transid %llu size %llu nbytes %llu\n"
+       printf("\t\tgeneration %llu transid %llu size %llu nbytes %llu\n"
               "\t\tblock group %llu mode %o links %u uid %u gid %u rdev %llu\n"
               "\t\tsequence %llu flags 0x%llx(%s)\n",
               (unsigned long long)btrfs_inode_generation(eb, ii),
@@ -956,8 +919,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");
@@ -1019,109 +982,280 @@ static void print_dev_stats(struct extent_buffer *eb,
        if (known < size) {
                printf("\t\tunknown stats item bytes %u", size - known);
                for (i = BTRFS_DEV_STAT_VALUES_MAX; i * sizeof(__le64) < size; i++) {
-                       printf("\t\tunknown item %u offset %lu value %llu\n",
+                       printf("\t\tunknown item %u offset %zu value %llu\n",
                                i, i * sizeof(__le64),
                                (unsigned long long)le64_to_cpu(values[i]));
                }
        }
 }
 
-void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
+static void print_block_group_item(struct extent_buffer *eb,
+               struct btrfs_block_group_item *bgi)
+{
+       struct btrfs_block_group_item bg_item;
+       char flags_str[256];
+
+       read_extent_buffer(eb, &bg_item, (unsigned long)bgi, sizeof(bg_item));
+       memset(flags_str, 0, sizeof(flags_str));
+       bg_flags_to_str(btrfs_block_group_flags(&bg_item), flags_str);
+       printf("\t\tblock group used %llu chunk_objectid %llu flags %s\n",
+               (unsigned long long)btrfs_block_group_used(&bg_item),
+               (unsigned long long)btrfs_block_group_chunk_objectid(&bg_item),
+               flags_str);
+}
+
+static void print_extent_data_ref(struct extent_buffer *eb, int slot)
 {
-       int i;
-       char *str;
-       struct btrfs_item *item;
-       struct btrfs_dir_item *di;
-       struct btrfs_inode_item *ii;
-       struct btrfs_file_extent_item *fi;
-       struct btrfs_block_group_item *bi;
        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),
+               (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));
+}
+
+static void print_shared_data_ref(struct extent_buffer *eb, int slot)
+{
        struct btrfs_shared_data_ref *sref;
-       struct btrfs_inode_ref *iref;
-       struct btrfs_inode_extref *iref2;
-       struct btrfs_dev_extent *dev_extent;
-       struct btrfs_disk_key disk_key;
-       struct btrfs_block_group_item bg_item;
+
+       sref = btrfs_item_ptr(eb, slot, struct btrfs_shared_data_ref);
+       printf("\t\tshared data backref count %u\n",
+               btrfs_shared_data_ref_count(eb, sref));
+}
+
+static void print_free_space_info(struct extent_buffer *eb, int slot)
+{
        struct btrfs_free_space_info *free_info;
-       struct btrfs_dir_log_item *dlog;
-       struct btrfs_qgroup_info_item *qg_info;
-       struct btrfs_qgroup_limit_item *qg_limit;
+
+       free_info = btrfs_item_ptr(eb, slot, struct btrfs_free_space_info);
+       printf("\t\tfree space info extent count %u flags %u\n",
+               (unsigned)btrfs_free_space_extent_count(eb, free_info),
+               (unsigned)btrfs_free_space_flags(eb, free_info));
+}
+
+static void print_dev_extent(struct extent_buffer *eb, int slot)
+{
+       struct btrfs_dev_extent *dev_extent;
+       u8 uuid[BTRFS_UUID_SIZE];
+       char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
+
+       dev_extent = btrfs_item_ptr(eb, slot, struct btrfs_dev_extent);
+       read_extent_buffer(eb, uuid,
+               (unsigned long)btrfs_dev_extent_chunk_tree_uuid(dev_extent),
+               BTRFS_UUID_SIZE);
+       uuid_unparse(uuid, uuid_str);
+       printf("\t\tdev extent chunk_tree %llu\n"
+               "\t\tchunk_objectid %llu chunk_offset %llu "
+               "length %llu\n"
+               "\t\tchunk_tree_uuid %s\n",
+               (unsigned long long)btrfs_dev_extent_chunk_tree(eb, dev_extent),
+               (unsigned long long)btrfs_dev_extent_chunk_objectid(eb, dev_extent),
+               (unsigned long long)btrfs_dev_extent_chunk_offset(eb, dev_extent),
+               (unsigned long long)btrfs_dev_extent_length(eb, dev_extent),
+               uuid_str);
+}
+
+static void print_qgroup_status(struct extent_buffer *eb, int slot)
+{
        struct btrfs_qgroup_status_item *qg_status;
-       u32 nr = btrfs_header_nritems(l);
-       u64 objectid;
-       u32 type;
-       u64 offset;
        char flags_str[256];
-       char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
-       u8 uuid[BTRFS_UUID_SIZE];
+
+       qg_status = btrfs_item_ptr(eb, slot, struct btrfs_qgroup_status_item);
+       memset(flags_str, 0, sizeof(flags_str));
+       qgroup_flags_to_str(btrfs_qgroup_status_flags(eb, qg_status),
+                                       flags_str);
+       printf("\t\tversion %llu generation %llu flags %s scan %lld\n",
+               (unsigned long long)btrfs_qgroup_status_version(eb, qg_status),
+               (unsigned long long)btrfs_qgroup_status_generation(eb, qg_status),
+               flags_str,
+               (unsigned long long)btrfs_qgroup_status_rescan(eb, qg_status));
+}
+
+static void print_qgroup_info(struct extent_buffer *eb, int slot)
+{
+       struct btrfs_qgroup_info_item *qg_info;
+
+       qg_info = btrfs_item_ptr(eb, slot, struct btrfs_qgroup_info_item);
+       printf("\t\tgeneration %llu\n"
+               "\t\treferenced %llu referenced_compressed %llu\n"
+               "\t\texclusive %llu exclusive_compressed %llu\n",
+               (unsigned long long)btrfs_qgroup_info_generation(eb, qg_info),
+               (unsigned long long)btrfs_qgroup_info_referenced(eb, qg_info),
+               (unsigned long long)btrfs_qgroup_info_referenced_compressed(eb,
+                                                                      qg_info),
+               (unsigned long long)btrfs_qgroup_info_exclusive(eb, qg_info),
+               (unsigned long long)btrfs_qgroup_info_exclusive_compressed(eb,
+                                                                     qg_info));
+}
+
+static void print_qgroup_limit(struct extent_buffer *eb, int slot)
+{
+       struct btrfs_qgroup_limit_item *qg_limit;
+
+       qg_limit = btrfs_item_ptr(eb, slot, struct btrfs_qgroup_limit_item);
+       printf("\t\tflags %llx\n"
+               "\t\tmax_referenced %lld max_exclusive %lld\n"
+               "\t\trsv_referenced %lld rsv_exclusive %lld\n",
+               (unsigned long long)btrfs_qgroup_limit_flags(eb, qg_limit),
+               (long long)btrfs_qgroup_limit_max_referenced(eb, qg_limit),
+               (long long)btrfs_qgroup_limit_max_exclusive(eb, qg_limit),
+               (long long)btrfs_qgroup_limit_rsv_referenced(eb, qg_limit),
+               (long long)btrfs_qgroup_limit_rsv_exclusive(eb, qg_limit));
+}
+
+static void print_persistent_item(struct extent_buffer *eb, void *ptr,
+               u32 item_size, u64 objectid, u64 offset)
+{
+       printf("\t\tpersistent item objectid ");
+       print_objectid(stdout, objectid, BTRFS_PERSISTENT_ITEM_KEY);
+       printf(" offset %llu\n", (unsigned long long)offset);
+       switch (objectid) {
+       case BTRFS_DEV_STATS_OBJECTID:
+               print_dev_stats(eb, ptr, item_size);
+               break;
+       default:
+               printf("\t\tunknown persistent item objectid %llu\n", objectid);
+       }
+}
+
+static void print_temporary_item(struct extent_buffer *eb, void *ptr,
+               u64 objectid, u64 offset)
+{
+       printf("\t\ttemporary item objectid ");
+       print_objectid(stdout, objectid, BTRFS_TEMPORARY_ITEM_KEY);
+       printf(" offset %llu\n", (unsigned long long)offset);
+       switch (objectid) {
+       case BTRFS_BALANCE_OBJECTID:
+               print_balance_item(eb, ptr);
+               break;
+       default:
+               printf("\t\tunknown temporary item objectid %llu\n", objectid);
+       }
+}
+
+static void print_extent_csum(struct extent_buffer *eb,
+               struct btrfs_fs_info *fs_info, u32 item_size, u64 start)
+{
+       u32 size;
+
+       size = (item_size / btrfs_super_csum_size(fs_info->super_copy)) *
+                       fs_info->sectorsize;
+       printf("\t\trange start %llu end %llu length %u\n",
+                       (unsigned long long)start,
+                       (unsigned long long)start + size, size);
+}
+
+/* Caller must ensure sizeof(*ret) >= 14 "WRITTEN|RELOC" */
+static void header_flags_to_str(u64 flags, char *ret)
+{
+       int empty = 1;
+
+       if (flags & BTRFS_HEADER_FLAG_WRITTEN) {
+               empty = 0;
+               strcpy(ret, "WRITTEN");
+       }
+       if (flags & BTRFS_HEADER_FLAG_RELOC) {
+               if (!empty)
+                       strcat(ret, "|");
+               strcat(ret, "RELOC");
+       }
+}
+
+void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *eb)
+{
+       struct btrfs_item *item;
+       struct btrfs_disk_key disk_key;
+       char flags_str[128];
+       u32 i;
+       u32 nr;
+       u64 flags;
+       u8 backref_rev;
+
+       flags = btrfs_header_flags(eb) & ~BTRFS_BACKREF_REV_MASK;
+       backref_rev = btrfs_header_flags(eb) >> BTRFS_BACKREF_REV_SHIFT;
+       header_flags_to_str(flags, flags_str);
+       nr = btrfs_header_nritems(eb);
 
        printf("leaf %llu items %d free space %d generation %llu owner %llu\n",
-               (unsigned long long)btrfs_header_bytenr(l), nr,
-               btrfs_leaf_free_space(root, l),
-               (unsigned long long)btrfs_header_generation(l),
-               (unsigned long long)btrfs_header_owner(l));
-       print_uuids(l);
+               (unsigned long long)btrfs_header_bytenr(eb), nr,
+               btrfs_leaf_free_space(root, eb),
+               (unsigned long long)btrfs_header_generation(eb),
+               (unsigned long long)btrfs_header_owner(eb));
+       printf("leaf %llu flags 0x%llx(%s) backref revision %d\n",
+               btrfs_header_bytenr(eb), flags, flags_str, backref_rev);
+       print_uuids(eb);
        fflush(stdout);
-       for (i = 0 ; i < nr ; i++) {
+
+       for (i = 0; i < nr; i++) {
                u32 item_size;
+               void *ptr;
+               u64 objectid;
+               u32 type;
+               u64 offset;
 
                item = btrfs_item_nr(i);
-               item_size = btrfs_item_size(l, item);
-               btrfs_item_key(l, &disk_key, i);
+               item_size = btrfs_item_size(eb, item);
+               /* Untyped extraction of slot from btrfs_item_ptr */
+               ptr = btrfs_item_ptr(eb, i, void*);
+
+               btrfs_item_key(eb, &disk_key, i);
                objectid = btrfs_disk_key_objectid(&disk_key);
                type = btrfs_disk_key_type(&disk_key);
                offset = btrfs_disk_key_offset(&disk_key);
+
                printf("\titem %d ", i);
                btrfs_print_key(&disk_key);
                printf(" itemoff %d itemsize %d\n",
-                       btrfs_item_offset(l, item),
-                       btrfs_item_size(l, item));
+                       btrfs_item_offset(eb, item),
+                       btrfs_item_size(eb, item));
 
                if (type == 0 && objectid == BTRFS_FREE_SPACE_OBJECTID)
-                       print_free_space_header(l, i);
+                       print_free_space_header(eb, i);
 
                switch (type) {
                case BTRFS_INODE_ITEM_KEY:
-                       ii = btrfs_item_ptr(l, i, struct btrfs_inode_item);
-                       print_inode_item(l, ii);
+                       print_inode_item(eb, ptr);
                        break;
                case BTRFS_INODE_REF_KEY:
-                       iref = btrfs_item_ptr(l, i, struct btrfs_inode_ref);
-                       print_inode_ref_item(l, item_size, iref);
+                       print_inode_ref_item(eb, item_size, ptr);
                        break;
                case BTRFS_INODE_EXTREF_KEY:
-                       iref2 = btrfs_item_ptr(l, i, struct btrfs_inode_extref);
-                       print_inode_extref_item(l, item_size, iref2);
+                       print_inode_extref_item(eb, item_size, ptr);
                        break;
                case BTRFS_DIR_ITEM_KEY:
                case BTRFS_DIR_INDEX_KEY:
                case BTRFS_XATTR_ITEM_KEY:
-                       di = btrfs_item_ptr(l, i, struct btrfs_dir_item);
-                       print_dir_item(l, item_size, di);
+                       print_dir_item(eb, item_size, ptr);
                        break;
                case BTRFS_DIR_LOG_INDEX_KEY:
-               case BTRFS_DIR_LOG_ITEM_KEY:
-                       dlog = btrfs_item_ptr(l, i, struct btrfs_dir_log_item);
+               case BTRFS_DIR_LOG_ITEM_KEY: {
+                       struct btrfs_dir_log_item *dlog;
+
+                       dlog = btrfs_item_ptr(eb, i, struct btrfs_dir_log_item);
                        printf("\t\tdir log end %Lu\n",
-                              (unsigned long long)btrfs_dir_log_end(l, dlog));
-                      break;
+                              (unsigned long long)btrfs_dir_log_end(eb, dlog));
+                       break;
+                       }
                case BTRFS_ORPHAN_ITEM_KEY:
                        printf("\t\torphan item\n");
                        break;
                case BTRFS_ROOT_ITEM_KEY:
-                       print_root(l, i);
+                       print_root_item(eb, i);
                        break;
                case BTRFS_ROOT_REF_KEY:
-                       print_root_ref(l, i, "ref");
+                       print_root_ref(eb, i, "ref");
                        break;
                case BTRFS_ROOT_BACKREF_KEY:
-                       print_root_ref(l, i, "backref");
+                       print_root_ref(eb, i, "backref");
                        break;
                case BTRFS_EXTENT_ITEM_KEY:
-                       print_extent_item(l, i, 0);
+                       print_extent_item(eb, i, 0);
                        break;
                case BTRFS_METADATA_ITEM_KEY:
-                       print_extent_item(l, i, 1);
+                       print_extent_item(eb, i, 1);
                        break;
                case BTRFS_TREE_BLOCK_REF_KEY:
                        printf("\t\ttree block backref\n");
@@ -1130,22 +1264,14 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                        printf("\t\tshared block backref\n");
                        break;
                case BTRFS_EXTENT_DATA_REF_KEY:
-                       dref = btrfs_item_ptr(l, i, 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(l, dref),
-                              (unsigned long long)btrfs_extent_data_ref_objectid(l, dref),
-                              (unsigned long long)btrfs_extent_data_ref_offset(l, dref),
-                              btrfs_extent_data_ref_count(l, dref));
+                       print_extent_data_ref(eb, i);
                        break;
                case BTRFS_SHARED_DATA_REF_KEY:
-                       sref = btrfs_item_ptr(l, i, struct btrfs_shared_data_ref);
-                       printf("\t\tshared data backref count %u\n",
-                              btrfs_shared_data_ref_count(l, sref));
+                       print_shared_data_ref(eb, i);
                        break;
                case BTRFS_EXTENT_REF_V0_KEY:
 #ifdef BTRFS_COMPAT_EXTENT_TREE_V0
-                       print_extent_ref_v0(l, i);
+                       print_extent_ref_v0(eb, i);
 #else
                        BUG();
 #endif
@@ -1154,31 +1280,17 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                        printf("\t\tcsum item\n");
                        break;
                case BTRFS_EXTENT_CSUM_KEY:
-                       printf("\t\textent csum item\n");
+                       print_extent_csum(eb, root->fs_info, item_size,
+                                       offset);
                        break;
                case BTRFS_EXTENT_DATA_KEY:
-                       fi = btrfs_item_ptr(l, i,
-                                           struct btrfs_file_extent_item);
-                       print_file_extent_item(l, item, i, fi);
+                       print_file_extent_item(eb, item, i, ptr);
                        break;
                case BTRFS_BLOCK_GROUP_ITEM_KEY:
-                       bi = btrfs_item_ptr(l, i,
-                                           struct btrfs_block_group_item);
-                       read_extent_buffer(l, &bg_item, (unsigned long)bi,
-                                          sizeof(bg_item));
-                       memset(flags_str, 0, sizeof(flags_str));
-                       bg_flags_to_str(btrfs_block_group_flags(&bg_item),
-                                       flags_str);
-                       printf("\t\tblock group used %llu chunk_objectid %llu flags %s\n",
-                              (unsigned long long)btrfs_block_group_used(&bg_item),
-                              (unsigned long long)btrfs_block_group_chunk_objectid(&bg_item),
-                              flags_str);
+                       print_block_group_item(eb, ptr);
                        break;
                case BTRFS_FREE_SPACE_INFO_KEY:
-                       free_info = btrfs_item_ptr(l, i, struct btrfs_free_space_info);
-                       printf("\t\tfree space info extent count %u flags %u\n",
-                              (unsigned)btrfs_free_space_extent_count(l, free_info),
-                              (unsigned)btrfs_free_space_flags(l, free_info));
+                       print_free_space_info(eb, i);
                        break;
                case BTRFS_FREE_SPACE_EXTENT_KEY:
                        printf("\t\tfree space extent\n");
@@ -1187,125 +1299,42 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                        printf("\t\tfree space bitmap\n");
                        break;
                case BTRFS_CHUNK_ITEM_KEY:
-                       print_chunk(l, btrfs_item_ptr(l, i, struct btrfs_chunk));
+                       print_chunk_item(eb, ptr);
                        break;
                case BTRFS_DEV_ITEM_KEY:
-                       print_dev_item(l, btrfs_item_ptr(l, i,
-                                       struct btrfs_dev_item));
+                       print_dev_item(eb, ptr);
                        break;
                case BTRFS_DEV_EXTENT_KEY:
-                       dev_extent = btrfs_item_ptr(l, i,
-                                                   struct btrfs_dev_extent);
-                       read_extent_buffer(l, uuid,
-                               (unsigned long)btrfs_dev_extent_chunk_tree_uuid(dev_extent),
-                               BTRFS_UUID_SIZE);
-                       uuid_unparse(uuid, uuid_str);
-                       printf("\t\tdev extent chunk_tree %llu\n"
-                              "\t\tchunk_objectid %llu chunk_offset %llu "
-                              "length %llu\n"
-                              "\t\tchunk_tree_uuid %s\n",
-                              (unsigned long long)
-                              btrfs_dev_extent_chunk_tree(l, dev_extent),
-                              (unsigned long long)
-                              btrfs_dev_extent_chunk_objectid(l, dev_extent),
-                              (unsigned long long)
-                              btrfs_dev_extent_chunk_offset(l, dev_extent),
-                              (unsigned long long)
-                              btrfs_dev_extent_length(l, dev_extent),
-                              uuid_str);
+                       print_dev_extent(eb, i);
                        break;
                case BTRFS_QGROUP_STATUS_KEY:
-                       qg_status = btrfs_item_ptr(l, i,
-                                       struct btrfs_qgroup_status_item);
-                       memset(flags_str, 0, sizeof(flags_str));
-                       qgroup_flags_to_str(btrfs_qgroup_status_flags(l, qg_status),
-                                       flags_str);
-                       printf("\t\tversion %llu generation %llu flags %s "
-                               "scan %lld\n",
-                               (unsigned long long)
-                               btrfs_qgroup_status_version(l, qg_status),
-                               (unsigned long long)
-                               btrfs_qgroup_status_generation(l, qg_status),
-                               flags_str,
-                               (unsigned long long)
-                               btrfs_qgroup_status_rescan(l, qg_status));
+                       print_qgroup_status(eb, i);
                        break;
                case BTRFS_QGROUP_RELATION_KEY:
                        break;
                case BTRFS_QGROUP_INFO_KEY:
-                       qg_info = btrfs_item_ptr(l, i,
-                                                struct btrfs_qgroup_info_item);
-                       printf("\t\tgeneration %llu\n"
-                            "\t\treferenced %llu referenced_compressed %llu\n"
-                            "\t\texclusive %llu exclusive_compressed %llu\n",
-                              (unsigned long long)
-                              btrfs_qgroup_info_generation(l, qg_info),
-                              (unsigned long long)
-                              btrfs_qgroup_info_referenced(l, qg_info),
-                              (unsigned long long)
-                              btrfs_qgroup_info_referenced_compressed(l,
-                                                                      qg_info),
-                              (unsigned long long)
-                              btrfs_qgroup_info_exclusive(l, qg_info),
-                              (unsigned long long)
-                              btrfs_qgroup_info_exclusive_compressed(l,
-                                                                     qg_info));
+                       print_qgroup_info(eb, i);
                        break;
                case BTRFS_QGROUP_LIMIT_KEY:
-                       qg_limit = btrfs_item_ptr(l, i,
-                                        struct btrfs_qgroup_limit_item);
-                       printf("\t\tflags %llx\n"
-                            "\t\tmax_referenced %lld max_exclusive %lld\n"
-                            "\t\trsv_referenced %lld rsv_exclusive %lld\n",
-                              (unsigned long long)
-                              btrfs_qgroup_limit_flags(l, qg_limit),
-                              (long long)
-                              btrfs_qgroup_limit_max_referenced(l, qg_limit),
-                              (long long)
-                              btrfs_qgroup_limit_max_exclusive(l, qg_limit),
-                              (long long)
-                              btrfs_qgroup_limit_rsv_referenced(l, qg_limit),
-                              (long long)
-                              btrfs_qgroup_limit_rsv_exclusive(l, qg_limit));
+                       print_qgroup_limit(eb, i);
                        break;
                case BTRFS_UUID_KEY_SUBVOL:
                case BTRFS_UUID_KEY_RECEIVED_SUBVOL:
-                       print_uuid_item(l, btrfs_item_ptr_offset(l, i),
-                                       btrfs_item_size_nr(l, i));
+                       print_uuid_item(eb, btrfs_item_ptr_offset(eb, i),
+                                       btrfs_item_size_nr(eb, i));
                        break;
-               case BTRFS_STRING_ITEM_KEY:
-                       /* dirty, but it's simple */
-                       str = l->data + btrfs_item_ptr_offset(l, i);
+               case BTRFS_STRING_ITEM_KEY: {
+                       const char *str = eb->data + btrfs_item_ptr_offset(eb, i);
+
                        printf("\t\titem data %.*s\n", item_size, str);
                        break;
-               case BTRFS_PERSISTENT_ITEM_KEY:
-                       printf("\t\tpersistent item objectid ");
-                       print_objectid(stdout, objectid, BTRFS_PERSISTENT_ITEM_KEY);
-                       printf(" offset %llu\n", (unsigned long long)offset);
-                       switch (objectid) {
-                       case BTRFS_DEV_STATS_OBJECTID:
-                               print_dev_stats(l, btrfs_item_ptr(l, i,
-                                               struct btrfs_dev_stats_item),
-                                               item_size);
-                               break;
-                       default:
-                               printf("\t\tunknown persistent item objectid %llu\n",
-                                               objectid);
                        }
+               case BTRFS_PERSISTENT_ITEM_KEY:
+                       print_persistent_item(eb, ptr, item_size, objectid,
+                                       offset);
                        break;
                case BTRFS_TEMPORARY_ITEM_KEY:
-                       printf("\t\ttemporary item objectid ");
-                       print_objectid(stdout, objectid, BTRFS_TEMPORARY_ITEM_KEY);
-                       printf(" offset %llu\n", (unsigned long long)offset);
-                       switch (objectid) {
-                       case BTRFS_BALANCE_OBJECTID:
-                               print_balance_item(l, btrfs_item_ptr(l, i,
-                                       struct btrfs_balance_item));
-                               break;
-                       default:
-                               printf("\t\tunknown temporary item objectid %llu\n",
-                                               objectid);
-                       }
+                       print_temporary_item(eb, ptr, objectid, offset);
                        break;
                };
                fflush(stdout);
@@ -1314,9 +1343,8 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
 
 void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int follow)
 {
-       int i;
+       u32 i;
        u32 nr;
-       u32 size;
        struct btrfs_disk_key disk_key;
        struct btrfs_key key;
        struct extent_buffer *next;
@@ -1331,12 +1359,11 @@ 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);
        fflush(stdout);
-       size = root->nodesize;
        for (i = 0; i < nr; i++) {
                u64 blocknr = btrfs_node_blockptr(eb, i);
                btrfs_node_key(eb, &disk_key, i);
@@ -1345,7 +1372,7 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int fol
                btrfs_print_key(&disk_key);
                printf(" block %llu (%llu) gen %llu\n",
                       (unsigned long long)blocknr,
-                      (unsigned long long)blocknr / size,
+                      (unsigned long long)blocknr / root->fs_info->nodesize,
                       (unsigned long long)btrfs_node_ptr_generation(eb, i));
                fflush(stdout);
        }
@@ -1353,7 +1380,8 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *eb, int fol
                return;
 
        for (i = 0; i < nr; i++) {
-               next = read_tree_block(root, btrfs_node_blockptr(eb, i), size,
+               next = read_tree_block(root->fs_info,
+                               btrfs_node_blockptr(eb, i),
                                btrfs_node_ptr_generation(eb, i));
                if (!extent_buffer_uptodate(next)) {
                        fprintf(stderr, "failed to read %llu in tree %llu\n",