Merge branch 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[cascardo/linux.git] / fs / btrfs / print-tree.c
index 147dc6c..438575e 100644 (file)
@@ -24,12 +24,11 @@ static void print_chunk(struct extent_buffer *eb, struct btrfs_chunk *chunk)
 {
        int num_stripes = btrfs_chunk_num_stripes(eb, chunk);
        int i;
-       printk(KERN_INFO "\t\tchunk length %llu owner %llu type %llu "
-              "num_stripes %d\n",
+       pr_info("\t\tchunk length %llu owner %llu type %llu num_stripes %d\n",
               btrfs_chunk_length(eb, chunk), btrfs_chunk_owner(eb, chunk),
               btrfs_chunk_type(eb, chunk), num_stripes);
        for (i = 0 ; i < num_stripes ; i++) {
-               printk(KERN_INFO "\t\t\tstripe %d devid %llu offset %llu\n", i,
+               pr_info("\t\t\tstripe %d devid %llu offset %llu\n", i,
                      btrfs_stripe_devid_nr(eb, chunk, i),
                      btrfs_stripe_offset_nr(eb, chunk, i));
        }
@@ -37,8 +36,7 @@ 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)
 {
-       printk(KERN_INFO "\t\tdev item devid %llu "
-              "total_bytes %llu bytes used %llu\n",
+       pr_info("\t\tdev item devid %llu total_bytes %llu bytes used %llu\n",
               btrfs_device_id(eb, dev_item),
               btrfs_device_total_bytes(eb, dev_item),
               btrfs_device_bytes_used(eb, dev_item));
@@ -46,8 +44,7 @@ static void print_dev_item(struct extent_buffer *eb,
 static void print_extent_data_ref(struct extent_buffer *eb,
                                  struct btrfs_extent_data_ref *ref)
 {
-       printk(KERN_INFO "\t\textent data backref root %llu "
-              "objectid %llu offset %llu count %u\n",
+       pr_info("\t\textent data backref root %llu objectid %llu offset %llu count %u\n",
               btrfs_extent_data_ref_root(eb, ref),
               btrfs_extent_data_ref_objectid(eb, ref),
               btrfs_extent_data_ref_offset(eb, ref),
@@ -72,7 +69,7 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
                struct btrfs_extent_item_v0 *ei0;
                BUG_ON(item_size != sizeof(*ei0));
                ei0 = btrfs_item_ptr(eb, slot, struct btrfs_extent_item_v0);
-               printk(KERN_INFO "\t\textent refs %u\n",
+               pr_info("\t\textent refs %u\n",
                       btrfs_extent_refs_v0(eb, ei0));
                return;
 #else
@@ -83,7 +80,7 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
        ei = btrfs_item_ptr(eb, slot, struct btrfs_extent_item);
        flags = btrfs_extent_flags(eb, ei);
 
-       printk(KERN_INFO "\t\textent refs %llu gen %llu flags %llu\n",
+       pr_info("\t\textent refs %llu gen %llu flags %llu\n",
               btrfs_extent_refs(eb, ei), btrfs_extent_generation(eb, ei),
               flags);
 
@@ -92,8 +89,7 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
                struct btrfs_tree_block_info *info;
                info = (struct btrfs_tree_block_info *)(ei + 1);
                btrfs_tree_block_key(eb, info, &key);
-               printk(KERN_INFO "\t\ttree block key (%llu %u %llu) "
-                      "level %d\n",
+               pr_info("\t\ttree block key (%llu %u %llu) level %d\n",
                       btrfs_disk_key_objectid(&key), key.type,
                       btrfs_disk_key_offset(&key),
                       btrfs_tree_block_level(eb, info));
@@ -110,12 +106,10 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
                offset = btrfs_extent_inline_ref_offset(eb, iref);
                switch (type) {
                case BTRFS_TREE_BLOCK_REF_KEY:
-                       printk(KERN_INFO "\t\ttree block backref "
-                               "root %llu\n", offset);
+                       pr_info("\t\ttree block backref root %llu\n", offset);
                        break;
                case BTRFS_SHARED_BLOCK_REF_KEY:
-                       printk(KERN_INFO "\t\tshared block backref "
-                               "parent %llu\n", offset);
+                       pr_info("\t\tshared block backref parent %llu\n", offset);
                        break;
                case BTRFS_EXTENT_DATA_REF_KEY:
                        dref = (struct btrfs_extent_data_ref *)(&iref->offset);
@@ -123,8 +117,7 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
                        break;
                case BTRFS_SHARED_DATA_REF_KEY:
                        sref = (struct btrfs_shared_data_ref *)(iref + 1);
-                       printk(KERN_INFO "\t\tshared data backref "
-                              "parent %llu count %u\n",
+                       pr_info("\t\tshared data backref parent %llu count %u\n",
                               offset, btrfs_shared_data_ref_count(eb, sref));
                        break;
                default:
@@ -141,8 +134,7 @@ static void print_extent_ref_v0(struct extent_buffer *eb, int slot)
        struct btrfs_extent_ref_v0 *ref0;
 
        ref0 = btrfs_item_ptr(eb, slot, struct btrfs_extent_ref_v0);
-       printk("\t\textent back ref root %llu gen %llu "
-               "owner %llu num_refs %lu\n",
+       printk("\t\textent back ref root %llu gen %llu owner %llu num_refs %lu\n",
                btrfs_ref_root_v0(eb, ref0),
                btrfs_ref_generation_v0(eb, ref0),
                btrfs_ref_objectid_v0(eb, ref0),
@@ -162,7 +154,7 @@ static void print_uuid_item(struct extent_buffer *l, unsigned long offset,
                __le64 subvol_id;
 
                read_extent_buffer(l, &subvol_id, offset, sizeof(subvol_id));
-               printk(KERN_INFO "\t\tsubvol_id %llu\n",
+               pr_info("\t\tsubvol_id %llu\n",
                       (unsigned long long)le64_to_cpu(subvol_id));
                item_size -= sizeof(u64);
                offset += sizeof(u64);
@@ -196,15 +188,13 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                item = btrfs_item_nr(i);
                btrfs_item_key_to_cpu(l, &key, i);
                type = key.type;
-               printk(KERN_INFO "\titem %d key (%llu %u %llu) itemoff %d "
-                      "itemsize %d\n",
+               pr_info("\titem %d key (%llu %u %llu) itemoff %d itemsize %d\n",
                        i, key.objectid, type, key.offset,
                        btrfs_item_offset(l, item), btrfs_item_size(l, item));
                switch (type) {
                case BTRFS_INODE_ITEM_KEY:
                        ii = btrfs_item_ptr(l, i, struct btrfs_inode_item);
-                       printk(KERN_INFO "\t\tinode generation %llu size %llu "
-                              "mode %o\n",
+                       pr_info("\t\tinode generation %llu size %llu mode %o\n",
                               btrfs_inode_generation(l, ii),
                               btrfs_inode_size(l, ii),
                               btrfs_inode_mode(l, ii));
@@ -212,13 +202,13 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                case BTRFS_DIR_ITEM_KEY:
                        di = btrfs_item_ptr(l, i, struct btrfs_dir_item);
                        btrfs_dir_item_key_to_cpu(l, di, &found_key);
-                       printk(KERN_INFO "\t\tdir oid %llu type %u\n",
+                       pr_info("\t\tdir oid %llu type %u\n",
                                found_key.objectid,
                                btrfs_dir_type(l, di));
                        break;
                case BTRFS_ROOT_ITEM_KEY:
                        ri = btrfs_item_ptr(l, i, struct btrfs_root_item);
-                       printk(KERN_INFO "\t\troot data bytenr %llu refs %u\n",
+                       pr_info("\t\troot data bytenr %llu refs %u\n",
                                btrfs_disk_root_bytenr(l, ri),
                                btrfs_disk_root_refs(l, ri));
                        break;
@@ -227,10 +217,10 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                        print_extent_item(l, i, type);
                        break;
                case BTRFS_TREE_BLOCK_REF_KEY:
-                       printk(KERN_INFO "\t\ttree block backref\n");
+                       pr_info("\t\ttree block backref\n");
                        break;
                case BTRFS_SHARED_BLOCK_REF_KEY:
-                       printk(KERN_INFO "\t\tshared block backref\n");
+                       pr_info("\t\tshared block backref\n");
                        break;
                case BTRFS_EXTENT_DATA_REF_KEY:
                        dref = btrfs_item_ptr(l, i,
@@ -240,7 +230,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                case BTRFS_SHARED_DATA_REF_KEY:
                        sref = btrfs_item_ptr(l, i,
                                              struct btrfs_shared_data_ref);
-                       printk(KERN_INFO "\t\tshared data backref count %u\n",
+                       pr_info("\t\tshared data backref count %u\n",
                               btrfs_shared_data_ref_count(l, sref));
                        break;
                case BTRFS_EXTENT_DATA_KEY:
@@ -248,17 +238,14 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                                            struct btrfs_file_extent_item);
                        if (btrfs_file_extent_type(l, fi) ==
                            BTRFS_FILE_EXTENT_INLINE) {
-                               printk(KERN_INFO "\t\tinline extent data "
-                                      "size %u\n",
+                               pr_info("\t\tinline extent data size %u\n",
                                       btrfs_file_extent_inline_len(l, i, fi));
                                break;
                        }
-                       printk(KERN_INFO "\t\textent data disk bytenr %llu "
-                              "nr %llu\n",
+                       pr_info("\t\textent data disk bytenr %llu nr %llu\n",
                               btrfs_file_extent_disk_bytenr(l, fi),
                               btrfs_file_extent_disk_num_bytes(l, fi));
-                       printk(KERN_INFO "\t\textent data offset %llu "
-                              "nr %llu ram %llu\n",
+                       pr_info("\t\textent data offset %llu nr %llu ram %llu\n",
                               btrfs_file_extent_offset(l, fi),
                               btrfs_file_extent_num_bytes(l, fi),
                               btrfs_file_extent_ram_bytes(l, fi));
@@ -273,7 +260,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                case BTRFS_BLOCK_GROUP_ITEM_KEY:
                        bi = btrfs_item_ptr(l, i,
                                            struct btrfs_block_group_item);
-                       printk(KERN_INFO "\t\tblock group used %llu\n",
+                       pr_info("\t\tblock group used %llu\n",
                               btrfs_disk_block_group_used(l, bi));
                        break;
                case BTRFS_CHUNK_ITEM_KEY:
@@ -287,38 +274,36 @@ void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
                case BTRFS_DEV_EXTENT_KEY:
                        dev_extent = btrfs_item_ptr(l, i,
                                                    struct btrfs_dev_extent);
-                       printk(KERN_INFO "\t\tdev extent chunk_tree %llu\n"
-                              "\t\tchunk objectid %llu chunk offset %llu "
-                              "length %llu\n",
+                       pr_info("\t\tdev extent chunk_tree %llu\n\t\tchunk objectid %llu chunk offset %llu length %llu\n",
                               btrfs_dev_extent_chunk_tree(l, dev_extent),
                               btrfs_dev_extent_chunk_objectid(l, dev_extent),
                               btrfs_dev_extent_chunk_offset(l, dev_extent),
                               btrfs_dev_extent_length(l, dev_extent));
                        break;
                case BTRFS_PERSISTENT_ITEM_KEY:
-                       printk(KERN_INFO "\t\tpersistent item objectid %llu offset %llu\n",
+                       pr_info("\t\tpersistent item objectid %llu offset %llu\n",
                                        key.objectid, key.offset);
                        switch (key.objectid) {
                        case BTRFS_DEV_STATS_OBJECTID:
-                               printk(KERN_INFO "\t\tdevice stats\n");
+                               pr_info("\t\tdevice stats\n");
                                break;
                        default:
-                               printk(KERN_INFO "\t\tunknown persistent item\n");
+                               pr_info("\t\tunknown persistent item\n");
                        }
                        break;
                case BTRFS_TEMPORARY_ITEM_KEY:
-                       printk(KERN_INFO "\t\ttemporary item objectid %llu offset %llu\n",
+                       pr_info("\t\ttemporary item objectid %llu offset %llu\n",
                                        key.objectid, key.offset);
                        switch (key.objectid) {
                        case BTRFS_BALANCE_OBJECTID:
-                               printk(KERN_INFO "\t\tbalance status\n");
+                               pr_info("\t\tbalance status\n");
                                break;
                        default:
-                               printk(KERN_INFO "\t\tunknown temporary item\n");
+                               pr_info("\t\tunknown temporary item\n");
                        }
                        break;
                case BTRFS_DEV_REPLACE_KEY:
-                       printk(KERN_INFO "\t\tdev replace\n");
+                       pr_info("\t\tdev replace\n");
                        break;
                case BTRFS_UUID_KEY_SUBVOL:
                case BTRFS_UUID_KEY_RECEIVED_SUBVOL:
@@ -343,12 +328,13 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *c)
                btrfs_print_leaf(root, c);
                return;
        }
-       btrfs_info(root->fs_info, "node %llu level %d total ptrs %d free spc %u",
-               btrfs_header_bytenr(c), level, nr,
-               (u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr);
+       btrfs_info(root->fs_info,
+                  "node %llu level %d total ptrs %d free spc %u",
+                  btrfs_header_bytenr(c), level, nr,
+                  (u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr);
        for (i = 0; i < nr; i++) {
                btrfs_node_key_to_cpu(c, &key, i);
-               printk(KERN_INFO "\tkey %d (%llu %u %llu) block %llu\n",
+               pr_info("\tkey %d (%llu %u %llu) block %llu\n",
                       i, key.objectid, key.type, key.offset,
                       btrfs_node_blockptr(c, i));
        }
@@ -356,6 +342,13 @@ void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *c)
                struct extent_buffer *next = read_tree_block(root,
                                        btrfs_node_blockptr(c, i),
                                        btrfs_node_ptr_generation(c, i));
+               if (IS_ERR(next)) {
+                       continue;
+               } else if (!extent_buffer_uptodate(next)) {
+                       free_extent_buffer(next);
+                       continue;
+               }
+
                if (btrfs_is_leaf(next) &&
                   level != 1)
                        BUG();