add some support for multiple devices to progs

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

diff --git a/print-tree.c b/print-tree.c
index 70058b0..0250d33 100644 (file)
--- a/print-tree.c
+++ b/print-tree.c
@@ -13,26 +13,25 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
        struct btrfs_extent_item *ei;
        struct btrfs_root_item *ri;
        struct btrfs_dir_item *di;
-       struct btrfs_inode_map_item *mi;
+       struct btrfs_device_item *devi;
        struct btrfs_inode_item *ii;
        struct btrfs_file_extent_item *fi;
        char *p;
        u32 type;
 
-       printf("leaf %Lu ptrs %d free space %d parent %Lu generation %Lu\n",
+       printf("leaf %Lu ptrs %d free space %d generation %Lu\n",
                btrfs_header_blocknr(&l->header), nr,
                btrfs_leaf_free_space(root, l),
-               btrfs_header_parentid(&l->header),
                btrfs_header_generation(&l->header));
        fflush(stdout);
        for (i = 0 ; i < nr ; i++) {
                item = l->items + i;
                type = btrfs_disk_key_type(&item->key);
-               printf("\titem %d key (%Lu %u %Lu) itemoff %d itemsize %d\n",
+               printf("\titem %d key (%Lu %Lu %u) itemoff %d itemsize %d\n",
                        i,
                        btrfs_disk_key_objectid(&item->key),
-                       btrfs_disk_key_flags(&item->key),
                        btrfs_disk_key_offset(&item->key),
+                       btrfs_disk_key_flags(&item->key),
                        btrfs_item_offset(item),
                        btrfs_item_size(item));
                switch (type) {
@@ -50,7 +49,16 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
                case BTRFS_DIR_ITEM_KEY:
                        di = btrfs_item_ptr(l, i, struct btrfs_dir_item);
                        printf("\t\tdir oid %Lu flags %u type %u\n",
-                               btrfs_dir_objectid(di),
+                               btrfs_disk_key_objectid(&di->location),
+                               btrfs_dir_flags(di),
+                               btrfs_dir_type(di));
+                       printf("\t\tname %.*s\n",
+                              btrfs_dir_name_len(di),(char *)(di + 1));
+                       break;
+               case BTRFS_DIR_INDEX_KEY:
+                       di = btrfs_item_ptr(l, i, struct btrfs_dir_item);
+                       printf("\t\tdir index %Lu flags %u type %u\n",
+                               btrfs_disk_key_objectid(&di->location),
                                btrfs_dir_flags(di),
                                btrfs_dir_type(di));
                        printf("\t\tname %.*s\n",
@@ -58,20 +66,15 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
                        break;
                case BTRFS_ROOT_ITEM_KEY:
                        ri = btrfs_item_ptr(l, i, struct btrfs_root_item);
-                       printf("\t\troot data blocknr %Lu refs %u\n",
-                               btrfs_root_blocknr(ri), btrfs_root_refs(ri));
+                       printf("\t\troot data blocknr %Lu dirid %Lu refs %u\n",
+                               btrfs_root_blocknr(ri),
+                               btrfs_root_dirid(ri),
+                               btrfs_root_refs(ri));
                        break;
                case BTRFS_EXTENT_ITEM_KEY:
                        ei = btrfs_item_ptr(l, i, struct btrfs_extent_item);
-                       printf("\t\textent data refs %u owner %Lu\n",
-                               btrfs_extent_refs(ei), btrfs_extent_owner(ei));
-                       break;
-               case BTRFS_INODE_MAP_ITEM_KEY:
-                       mi = btrfs_item_ptr(l, i, struct btrfs_inode_map_item);
-                       printf("\t\tinode map key %Lu %u %Lu\n",
-                              btrfs_disk_key_objectid(&mi->key),
-                              btrfs_disk_key_flags(&mi->key),
-                              btrfs_disk_key_offset(&mi->key));
+                       printf("\t\textent data refs %u\n",
+                               btrfs_extent_refs(ei));
                        break;
                case BTRFS_EXTENT_DATA_KEY:
                        fi = btrfs_item_ptr(l, i,
@@ -83,6 +86,14 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
                               btrfs_file_extent_offset(fi),
                               btrfs_file_extent_num_blocks(fi));
                        break;
+               case BTRFS_DEV_ITEM_KEY:
+                       devi = btrfs_item_ptr(l, i, struct btrfs_device_item);
+                       printf("\t\tdev id %Lu namelen %u name %.*s\n",
+                              btrfs_device_id(devi),
+                               btrfs_device_pathlen(devi),
+                               btrfs_device_pathlen(devi),
+                               (char *)(devi + 1));
+                       break;
                case BTRFS_STRING_ITEM_KEY:
                        printf("\t\titem data %.*s\n", btrfs_item_size(item),
                                btrfs_leaf_data(l) + btrfs_item_offset(item));
@@ -105,11 +116,10 @@ void btrfs_print_tree(struct btrfs_root *root, struct btrfs_buffer *t)
                btrfs_print_leaf(root, (struct btrfs_leaf *)c);
                return;
        }
-       printf("node %Lu level %d ptrs %d free %u parent %Lu generation %Lu\n",
+       printf("node %Lu level %d ptrs %d free %u generation %Lu\n",
               t->blocknr,
                btrfs_header_level(&c->header), nr,
                (u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr,
-               btrfs_header_parentid(&c->header),
                btrfs_header_generation(&c->header));
        fflush(stdout);
        for (i = 0; i < nr; i++) {