btrfs: Remove V0 extent support

[sfrench/cifs-2.6.git] / fs / btrfs / print-tree.c

diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index a4e11cf04671e6777802922d460dec16007b8380..c0dac9d7ce331f092f92c9538f0a514bd42458f4 100644 (file)
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/print-tree.c
@@ -52,18 +52,8 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
        u64 offset;
        int ref_index = 0;
 
-       if (item_size < sizeof(*ei)) {
-#ifdef BTRFS_COMPAT_EXTENT_TREE_V0
-               struct btrfs_extent_item_v0 *ei0;
-               BUG_ON(item_size != sizeof(*ei0));
-               ei0 = btrfs_item_ptr(eb, slot, struct btrfs_extent_item_v0);
-               pr_info("\t\textent refs %u\n",
-                      btrfs_extent_refs_v0(eb, ei0));
-               return;
-#else
+       if (item_size < sizeof(*ei))
                BUG();
-#endif
-       }
 
        ei = btrfs_item_ptr(eb, slot, struct btrfs_extent_item);
        flags = btrfs_extent_flags(eb, ei);
@@ -133,20 +123,6 @@ static void print_extent_item(struct extent_buffer *eb, int slot, int type)
        WARN_ON(ptr > end);
 }
 
-#ifdef BTRFS_COMPAT_EXTENT_TREE_V0
-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",
-               btrfs_ref_root_v0(eb, ref0),
-               btrfs_ref_generation_v0(eb, ref0),
-               btrfs_ref_objectid_v0(eb, ref0),
-               (unsigned long)btrfs_ref_count_v0(eb, ref0));
-}
-#endif
-
 static void print_uuid_item(struct extent_buffer *l, unsigned long offset,
                            u32 item_size)
 {
@@ -267,8 +243,8 @@ void btrfs_print_leaf(struct extent_buffer *l)
                                            struct btrfs_file_extent_item);
                        if (btrfs_file_extent_type(l, fi) ==
                            BTRFS_FILE_EXTENT_INLINE) {
-                               pr_info("\t\tinline extent data size %u\n",
-                                      btrfs_file_extent_inline_len(l, i, fi));
+                               pr_info("\t\tinline extent data size %llu\n",
+                                      btrfs_file_extent_ram_bytes(l, fi));
                                break;
                        }
                        pr_info("\t\textent data disk bytenr %llu nr %llu\n",
@@ -280,11 +256,7 @@ void btrfs_print_leaf(struct extent_buffer *l)
                               btrfs_file_extent_ram_bytes(l, fi));
                        break;
                case BTRFS_EXTENT_REF_V0_KEY:
-#ifdef BTRFS_COMPAT_EXTENT_TREE_V0
-                       print_extent_ref_v0(l, i);
-#else
                        BUG();
-#endif
                        break;
                case BTRFS_BLOCK_GROUP_ITEM_KEY:
                        bi = btrfs_item_ptr(l, i,