diff options
Diffstat (limited to 'fs/btrfs/backref.c')
| -rw-r--r-- | fs/btrfs/backref.c | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index d85f90c92bb..290e347b6db 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -1347,10 +1347,9 @@ int extent_from_logical(struct btrfs_fs_info *fs_info, u64 logical, * returns <0 on error */ static int __get_extent_inline_ref(unsigned long *ptr, struct extent_buffer *eb, - struct btrfs_key *key, - struct btrfs_extent_item *ei, u32 item_size, - struct btrfs_extent_inline_ref **out_eiref, - int *out_type) + struct btrfs_extent_item *ei, u32 item_size, + struct btrfs_extent_inline_ref **out_eiref, + int *out_type) { unsigned long end; u64 flags; @@ -1360,26 +1359,19 @@ static int __get_extent_inline_ref(unsigned long *ptr, struct extent_buffer *eb, /* first call */ flags = btrfs_extent_flags(eb, ei); if (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK) { - if (key->type == BTRFS_METADATA_ITEM_KEY) { - /* a skinny metadata extent */ - *out_eiref = - (struct btrfs_extent_inline_ref *)(ei + 1); - } else { - WARN_ON(key->type != BTRFS_EXTENT_ITEM_KEY); - info = (struct btrfs_tree_block_info *)(ei + 1); - *out_eiref = - (struct btrfs_extent_inline_ref *)(info + 1); - } + info = (struct btrfs_tree_block_info *)(ei + 1); + *out_eiref = + (struct btrfs_extent_inline_ref *)(info + 1); } else { *out_eiref = (struct btrfs_extent_inline_ref *)(ei + 1); } *ptr = (unsigned long)*out_eiref; - if ((unsigned long)(*ptr) >= (unsigned long)ei + item_size) + if ((void *)*ptr >= (void *)ei + item_size) return -ENOENT; } end = (unsigned long)ei + item_size; - *out_eiref = (struct btrfs_extent_inline_ref *)(*ptr); + *out_eiref = (struct btrfs_extent_inline_ref *)*ptr; *out_type = btrfs_extent_inline_ref_type(eb, *out_eiref); *ptr += btrfs_extent_inline_ref_size(*out_type); @@ -1398,8 +1390,8 @@ static int __get_extent_inline_ref(unsigned long *ptr, struct extent_buffer *eb, * <0 on error. */ int tree_backref_for_extent(unsigned long *ptr, struct extent_buffer *eb, - struct btrfs_key *key, struct btrfs_extent_item *ei, - u32 item_size, u64 *out_root, u8 *out_level) + struct btrfs_extent_item *ei, u32 item_size, + u64 *out_root, u8 *out_level) { int ret; int type; @@ -1410,8 +1402,8 @@ int tree_backref_for_extent(unsigned long *ptr, struct extent_buffer *eb, return 1; while (1) { - ret = __get_extent_inline_ref(ptr, eb, key, ei, item_size, - &eiref, &type); + ret = __get_extent_inline_ref(ptr, eb, ei, item_size, + &eiref, &type); if (ret < 0) return ret; |