btrfs-progs: make pretty Documentation/ build match the rest

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

diff --git a/print-tree.c b/print-tree.c
index 716f4d3..cb5c2e1 100644 (file)
--- a/print-tree.c
+++ b/print-tree.c
@@ -160,7 +160,7 @@ static int print_inode_ref_item(struct extent_buffer *eb, struct btrfs_item *ite
        return 0;
 }
 
-static void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk)
+void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk)
 {
        int num_stripes = btrfs_chunk_num_stripes(eb, chunk);
        int i;
@@ -179,11 +179,20 @@ static void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk)
 static void print_dev_item(struct extent_buffer *eb,
                           struct btrfs_dev_item *dev_item)
 {
+       char disk_uuid_c[BTRFS_UUID_UNPARSED_SIZE];
+       u8 disk_uuid[BTRFS_UUID_SIZE];
+
+       read_extent_buffer(eb, disk_uuid,
+                          (unsigned long)btrfs_device_uuid(dev_item),
+                          BTRFS_UUID_SIZE);
+       uuid_unparse(disk_uuid, disk_uuid_c);
        printf("\t\tdev item devid %llu "
-              "total_bytes %llu bytes used %Lu\n",
+              "total_bytes %llu bytes used %Lu\n"
+              "\t\tdev uuid %s\n",
               (unsigned long long)btrfs_device_id(eb, dev_item),
               (unsigned long long)btrfs_device_total_bytes(eb, dev_item),
-              (unsigned long long)btrfs_device_bytes_used(eb, dev_item));
+              (unsigned long long)btrfs_device_bytes_used(eb, dev_item),
+              disk_uuid_c);
 }
 
 static void print_uuids(struct extent_buffer *eb)
@@ -209,6 +218,7 @@ static void print_uuids(struct extent_buffer *eb)
 
 static void print_file_extent_item(struct extent_buffer *eb,
                                   struct btrfs_item *item,
+                                  int slot,
                                   struct btrfs_file_extent_item *fi)
 {
        int extent_type = btrfs_file_extent_type(eb, fi);
@@ -217,7 +227,7 @@ static void print_file_extent_item(struct extent_buffer *eb,
                printf("\t\tinline extent data size %u "
                       "ram %u compress %d\n",
                  btrfs_file_extent_inline_item_len(eb, item),
-                 btrfs_file_extent_inline_len(eb, fi),
+                 btrfs_file_extent_inline_len(eb, slot, fi),
                  btrfs_file_extent_compression(eb, fi));
                return;
        }
@@ -241,7 +251,7 @@ static void print_file_extent_item(struct extent_buffer *eb,
               btrfs_file_extent_compression(eb, fi));
 }
 
-static void print_extent_item(struct extent_buffer *eb, int slot, int metadata)
+void print_extent_item(struct extent_buffer *eb, int slot, int metadata)
 {
        struct btrfs_extent_item *ei;
        struct btrfs_extent_inline_ref *iref;
@@ -378,7 +388,7 @@ static void print_root(struct extent_buffer *leaf, int slot)
        struct btrfs_root_item *ri;
        struct btrfs_root_item root_item;
        int len;
-       char uuid_str[128];
+       char uuid_str[BTRFS_UUID_UNPARSED_SIZE];
 
        ri = btrfs_item_ptr(leaf, slot, struct btrfs_root_item);
        len = btrfs_item_size_nr(leaf, slot);
@@ -829,7 +839,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                case BTRFS_EXTENT_DATA_KEY:
                        fi = btrfs_item_ptr(l, i,
                                            struct btrfs_file_extent_item);
-                       print_file_extent_item(l, item, fi);
+                       print_file_extent_item(l, item, i, fi);
                        break;
                case BTRFS_BLOCK_GROUP_ITEM_KEY:
                        bi = btrfs_item_ptr(l, i,
@@ -883,18 +893,18 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                        qg_info = btrfs_item_ptr(l, i,
                                                 struct btrfs_qgroup_info_item);
                        printf("\t\tgeneration %llu\n"
-                            "\t\treferenced %lld referenced compressed %lld\n"
-                            "\t\texclusive %lld exclusive compressed %lld\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),
-                              (long long)
+                              (unsigned long long)
                               btrfs_qgroup_info_referenced(l, qg_info),
-                              (long long)
+                              (unsigned long long)
                               btrfs_qgroup_info_referenced_compressed(l,
                                                                       qg_info),
-                              (long long)
+                              (unsigned long long)
                               btrfs_qgroup_info_exclusive(l, qg_info),
-                              (long long)
+                              (unsigned long long)
                               btrfs_qgroup_info_exclusive_compressed(l,
                                                                      qg_info));
                        break;