OSDN Git Service

btrfs: Remove fs_info argument from lookup_extent_data_ref
authorNikolay Borisov <nborisov@suse.com>
Wed, 20 Jun 2018 12:48:51 +0000 (15:48 +0300)
committerDavid Sterba <dsterba@suse.com>
Mon, 6 Aug 2018 11:12:33 +0000 (13:12 +0200)
This function is always called with a valid transaction handle from
where fs_info can be referenced. No functional changes.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent-tree.c

index 85e1b54..2fc879a 100644 (file)
@@ -1216,13 +1216,12 @@ static int match_extent_data_ref(struct extent_buffer *leaf,
 }
 
 static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans,
-                                          struct btrfs_fs_info *fs_info,
                                           struct btrfs_path *path,
                                           u64 bytenr, u64 parent,
                                           u64 root_objectid,
                                           u64 owner, u64 offset)
 {
-       struct btrfs_root *root = fs_info->extent_root;
+       struct btrfs_root *root = trans->fs_info->extent_root;
        struct btrfs_key key;
        struct btrfs_extent_data_ref *ref;
        struct extent_buffer *leaf;
@@ -1880,9 +1879,8 @@ static int lookup_extent_backref(struct btrfs_trans_handle *trans,
                ret = lookup_tree_block_ref(trans, path, bytenr, parent,
                                            root_objectid);
        } else {
-               ret = lookup_extent_data_ref(trans, fs_info, path, bytenr,
-                                            parent, root_objectid, owner,
-                                            offset);
+               ret = lookup_extent_data_ref(trans, path, bytenr, parent,
+                                            root_objectid, owner, offset);
        }
        return ret;
 }