Btrfs: Create extent_buffer interface for large blocksizes

Signed-off-by: Chris Mason <chris.mason@oracle.com>

1 files changed, 45 insertions, 51 deletions

diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index bafa78603bd2..a825ce078a54 100644
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/print-tree.c
@@ -20,10 +20,10 @@
 #include "disk-io.h"
 #include "print-tree.h"
 
-void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
+void btrfs_print_leaf(struct btrfs_root *root, struct extent_buffer *l)
 {
         int i;
-        u32 nr = btrfs_header_nritems(&l->header);
+        u32 nr = btrfs_header_nritems(l);
         struct btrfs_item *item;
         struct btrfs_extent_item *ei;
         struct btrfs_root_item *ri;
@@ -31,119 +31,113 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
         struct btrfs_inode_item *ii;
         struct btrfs_block_group_item *bi;
         struct btrfs_file_extent_item *fi;
+        struct btrfs_key key;
+        struct btrfs_key found_key;
         u32 type;
 
         printk("leaf %llu total ptrs %d free space %d\n",
-                (unsigned long long)btrfs_header_blocknr(&l->header), nr,
+                (unsigned long long)btrfs_header_blocknr(l), nr,
                 btrfs_leaf_free_space(root, l));
         for (i = 0 ; i < nr ; i++) {
-                item = l->items + i;
-                type = btrfs_disk_key_type(&item->key);
+                item = btrfs_item_nr(l, i);
+                btrfs_item_key_to_cpu(l, &key, i);
+                type = btrfs_key_type(&key);
                 printk("\titem %d key (%llu %x %llu) itemoff %d itemsize %d\n",
                         i,
-                        (unsigned long long)btrfs_disk_key_objectid(&item->key),
-                        btrfs_disk_key_flags(&item->key),
-                        (unsigned long long)btrfs_disk_key_offset(&item->key),
-                        btrfs_item_offset(item),
-                        btrfs_item_size(item));
+                        (unsigned long long)key.objectid, type,
+                        (unsigned long long)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("\t\tinode generation %llu size %llu mode %o\n",
-                               (unsigned long long)btrfs_inode_generation(ii),
-                               (unsigned long long)btrfs_inode_size(ii),
-                               btrfs_inode_mode(ii));
+                              (unsigned long long)btrfs_inode_generation(l, ii),
+                              (unsigned long long)btrfs_inode_size(l, ii),
+                               btrfs_inode_mode(l, ii));
                         break;
                 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("\t\tdir oid %llu flags %u type %u\n",
-                                (unsigned long long)btrfs_disk_key_objectid(
-                                                            &di->location),
-                                btrfs_dir_flags(di),
-                                btrfs_dir_type(di));
-                        printk("\t\tname %.*s\n",
-                               btrfs_dir_name_len(di),(char *)(di + 1));
+                                (unsigned long long)found_key.objectid,
+                                btrfs_dir_flags(l, di),
+                                btrfs_dir_type(l, di));
                         break;
                 case BTRFS_ROOT_ITEM_KEY:
                         ri = btrfs_item_ptr(l, i, struct btrfs_root_item);
                         printk("\t\troot data blocknr %llu refs %u\n",
-                                (unsigned long long)btrfs_root_blocknr(ri),
-                                btrfs_root_refs(ri));
+                                (unsigned long long)btrfs_disk_root_blocknr(l, ri),
+                                btrfs_disk_root_refs(l, ri));
                         break;
                 case BTRFS_EXTENT_ITEM_KEY:
                         ei = btrfs_item_ptr(l, i, struct btrfs_extent_item);
                         printk("\t\textent data refs %u\n",
-                                btrfs_extent_refs(ei));
+                                btrfs_extent_refs(l, ei));
                         break;
 
                 case BTRFS_EXTENT_DATA_KEY:
                         fi = btrfs_item_ptr(l, i,
                                             struct btrfs_file_extent_item);
-                        if (btrfs_file_extent_type(fi) ==
+                        if (btrfs_file_extent_type(l, fi) ==
                             BTRFS_FILE_EXTENT_INLINE) {
                                 printk("\t\tinline extent data size %u\n",
-                                   btrfs_file_extent_inline_len(l->items + i));
+                                   btrfs_file_extent_inline_len(l, item));
                                 break;
                         }
                         printk("\t\textent data disk block %llu nr %llu\n",
-                               (unsigned long long)btrfs_file_extent_disk_blocknr(fi),
-                               (unsigned long long)btrfs_file_extent_disk_num_blocks(fi));
+                               (unsigned long long)btrfs_file_extent_disk_blocknr(l, fi),
+                               (unsigned long long)btrfs_file_extent_disk_num_blocks(l, fi));
                         printk("\t\textent data offset %llu nr %llu\n",
-                          (unsigned long long)btrfs_file_extent_offset(fi),
-                          (unsigned long long)btrfs_file_extent_num_blocks(fi));
+                          (unsigned long long)btrfs_file_extent_offset(l, fi),
+                          (unsigned long long)btrfs_file_extent_num_blocks(l, fi));
                         break;
                 case BTRFS_BLOCK_GROUP_ITEM_KEY:
                         bi = btrfs_item_ptr(l, i,
                                             struct btrfs_block_group_item);
                         printk("\t\tblock group used %llu\n",
-                               (unsigned long long)btrfs_block_group_used(bi));
-                        break;
-                case BTRFS_STRING_ITEM_KEY:
-                        printk("\t\titem data %.*s\n", btrfs_item_size(item),
-                                btrfs_leaf_data(l) + btrfs_item_offset(item));
+                               (unsigned long long)btrfs_disk_block_group_used(l, bi));
                         break;
                 };
         }
 }
 
-void btrfs_print_tree(struct btrfs_root *root, struct buffer_head *t)
+void btrfs_print_tree(struct btrfs_root *root, struct extent_buffer *c)
 {
         int i;
         u32 nr;
-        struct btrfs_node *c;
+        struct btrfs_key key;
 
-        if (!t)
+        if (!c)
                 return;
-        c = btrfs_buffer_node(t);
-        nr = btrfs_header_nritems(&c->header);
+        nr = btrfs_header_nritems(c);
         if (btrfs_is_leaf(c)) {
-                btrfs_print_leaf(root, (struct btrfs_leaf *)c);
+                btrfs_print_leaf(root, c);
                 return;
         }
         printk("node %llu level %d total ptrs %d free spc %u\n",
-               (unsigned long long)btrfs_header_blocknr(&c->header),
-               btrfs_header_level(&c->header), nr,
+               (unsigned long long)btrfs_header_blocknr(c),
+               btrfs_header_level(c), nr,
                (u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr);
         for (i = 0; i < nr; i++) {
+                btrfs_node_key_to_cpu(c, &key, i);
                 printk("\tkey %d (%llu %u %llu) block %llu\n",
                        i,
-                       (unsigned long long)c->ptrs[i].key.objectid,
-                       c->ptrs[i].key.flags,
-                       (unsigned long long)c->ptrs[i].key.offset,
+                       (unsigned long long)key.objectid,
+                       key.type,
+                       (unsigned long long)key.offset,
                        (unsigned long long)btrfs_node_blockptr(c, i));
         }
         for (i = 0; i < nr; i++) {
-                struct buffer_head *next_buf = read_tree_block(root,
+                struct extent_buffer *next = read_tree_block(root,
                                                 btrfs_node_blockptr(c, i));
-                struct btrfs_node *next = btrfs_buffer_node(next_buf);
                 if (btrfs_is_leaf(next) &&
-                    btrfs_header_level(&c->header) != 1)
+                    btrfs_header_level(c) != 1)
                         BUG();
-                if (btrfs_header_level(&next->header) !=
-                        btrfs_header_level(&c->header) - 1)
+                if (btrfs_header_level(next) !=
+                        btrfs_header_level(c) - 1)
                         BUG();
-                btrfs_print_tree(root, next_buf);
-                btrfs_block_release(root, next_buf);
+                btrfs_print_tree(root, next);
+                free_extent_buffer(next);
         }
 }