Btrfs: make some funcs static

[safe/jmp/linux-2.6] / fs / btrfs / print-tree.c

diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index e32a959..c95c856 100644 (file)
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/print-tree.c
@@ -5,69 +5,71 @@
 #include "ctree.h"
 #include "disk-io.h"
 
-void print_leaf(struct leaf *l)
+void btrfs_print_leaf(struct btrfs_leaf *l)
 {
        int i;
-       int nr = l->header.nritems;
-       struct item *item;
-       struct extent_item *ei;
-       printf("leaf %Lu total ptrs %d free space %d\n", l->header.blocknr, nr,
-              leaf_free_space(l));
+       u32 nr = btrfs_header_nritems(&l->header);
+       struct btrfs_item *item;
+       struct btrfs_extent_item *ei;
+       printf("leaf %Lu total ptrs %d free space %d\n",
+               btrfs_header_blocknr(&l->header), nr, btrfs_leaf_free_space(l));
        fflush(stdout);
        for (i = 0 ; i < nr ; i++) {
                item = l->items + i;
                printf("\titem %d key (%Lu %u %Lu) itemoff %d itemsize %d\n",
                        i,
-                       item->key.objectid, item->key.flags, item->key.offset,
-                       item->offset, item->size);
+                       btrfs_key_objectid(&item->key),
+                       btrfs_key_flags(&item->key),
+                       btrfs_key_offset(&item->key),
+                       btrfs_item_offset(item),
+                       btrfs_item_size(item));
                fflush(stdout);
-               printf("\t\titem data %.*s\n", item->size,
-                       l->data+item->offset);
-               ei = (struct extent_item *)(l->data + item->offset);
+               printf("\t\titem data %.*s\n", btrfs_item_size(item),
+                       l->data + btrfs_item_offset(item));
+               ei = (struct btrfs_extent_item *)(l->data +
+                                                 btrfs_item_offset(item));
                printf("\t\textent data refs %u owner %Lu\n", ei->refs,
                        ei->owner);
                fflush(stdout);
        }
 }
-void print_tree(struct ctree_root *root, struct tree_buffer *t)
+void btrfs_print_tree(struct btrfs_root *root, struct btrfs_buffer *t)
 {
        int i;
-       int nr;
-       struct node *c;
+       u32 nr;
+       struct btrfs_node *c;
 
        if (!t)
                return;
        c = &t->node;
-       nr = c->header.nritems;
-       if (c->header.blocknr != t->blocknr)
-               BUG();
-       if (is_leaf(c->header.flags)) {
-               print_leaf((struct leaf *)c);
+       nr = btrfs_header_nritems(&c->header);
+       if (btrfs_is_leaf(c)) {
+               btrfs_print_leaf((struct btrfs_leaf *)c);
                return;
        }
        printf("node %Lu level %d total ptrs %d free spc %u\n", t->blocknr,
-               node_level(c->header.flags), c->header.nritems,
-               (u32)NODEPTRS_PER_BLOCK - c->header.nritems);
+               btrfs_header_level(&c->header), nr,
+               (u32)NODEPTRS_PER_BLOCK - nr);
        fflush(stdout);
        for (i = 0; i < nr; i++) {
                printf("\tkey %d (%Lu %u %Lu) block %Lu\n",
                       i,
                       c->keys[i].objectid, c->keys[i].flags, c->keys[i].offset,
-                      c->blockptrs[i]);
+                      btrfs_node_blockptr(c, i));
                fflush(stdout);
        }
        for (i = 0; i < nr; i++) {
-               struct tree_buffer *next_buf = read_tree_block(root,
-                                                           c->blockptrs[i]);
-               struct node *next = &next_buf->node;
-               if (is_leaf(next->header.flags) &&
-                   node_level(c->header.flags) != 1)
+               struct btrfs_buffer *next_buf = read_tree_block(root,
+                                               btrfs_node_blockptr(c, i));
+               struct btrfs_node *next = &next_buf->node;
+               if (btrfs_is_leaf(next) &&
+                   btrfs_header_level(&c->header) != 1)
                        BUG();
-               if (node_level(next->header.flags) !=
-                       node_level(c->header.flags) - 1)
+               if (btrfs_header_level(&next->header) !=
+                       btrfs_header_level(&c->header) - 1)
                        BUG();
-               print_tree(root, next_buf);
-               tree_block_release(root, next_buf);
+               btrfs_print_tree(root, next_buf);
+               btrfs_block_release(root, next_buf);
        }
 
 }