btrfs: Remove fs_info from btrfs_del_root_ref

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

It can be referenced from the passed transaction handle.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>

authored by

Lu Fengqi and committed by

David Sterba 7 years ago 3ee1c553 ab9ce7d4

+10 -14

3 changed files

expand all

btrfs

ctree.h

inode.c

root-tree.c

+3 -4

fs/btrfs/ctree.h

··· 2988 2988 struct btrfs_fs_info *fs_info, 2989 2989 u64 root_id, u64 ref_id, u64 dirid, u64 sequence, 2990 2990 const char *name, int name_len); 2991 - int btrfs_del_root_ref(struct btrfs_trans_handle *trans, 2992 - struct btrfs_fs_info *fs_info, 2993 - u64 root_id, u64 ref_id, u64 dirid, u64 *sequence, 2994 - const char *name, int name_len); 2991 + int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 2992 + u64 ref_id, u64 dirid, u64 *sequence, const char *name, 2993 + int name_len); 2995 2994 int btrfs_del_root(struct btrfs_trans_handle *trans, 2996 2995 const struct btrfs_key *key); 2997 2996 int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root *root,

+3 -5

fs/btrfs/inode.c

··· 4085 4085 struct inode *dir, u64 objectid, 4086 4086 const char *name, int name_len) 4087 4087 { 4088 - struct btrfs_fs_info *fs_info = root->fs_info; 4089 4088 struct btrfs_path *path; 4090 4089 struct extent_buffer *leaf; 4091 4090 struct btrfs_dir_item *di; ··· 4117 4118 } 4118 4119 btrfs_release_path(path); 4119 4120 4120 - ret = btrfs_del_root_ref(trans, fs_info, objectid, 4121 - root->root_key.objectid, dir_ino, 4122 - &index, name, name_len); 4121 + ret = btrfs_del_root_ref(trans, objectid, root->root_key.objectid, 4122 + dir_ino, &index, name, name_len); 4123 4123 if (ret < 0) { 4124 4124 if (ret != -ENOENT) { 4125 4125 btrfs_abort_transaction(trans, ret); ··· 6437 6439 if (unlikely(ino == BTRFS_FIRST_FREE_OBJECTID)) { 6438 6440 u64 local_index; 6439 6441 int err; 6440 - err = btrfs_del_root_ref(trans, fs_info, key.objectid, 6442 + err = btrfs_del_root_ref(trans, key.objectid, 6441 6443 root->root_key.objectid, parent_ino, 6442 6444 &local_index, name, name_len); 6443 6445

+4 -5

fs/btrfs/root-tree.c

··· 341 341 return ret; 342 342 } 343 343 344 - int btrfs_del_root_ref(struct btrfs_trans_handle *trans, 345 - struct btrfs_fs_info *fs_info, 346 - u64 root_id, u64 ref_id, u64 dirid, u64 *sequence, 347 - const char *name, int name_len) 344 + int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, 345 + u64 ref_id, u64 dirid, u64 *sequence, const char *name, 346 + int name_len) 348 347 349 348 { 350 - struct btrfs_root *tree_root = fs_info->tree_root; 349 + struct btrfs_root *tree_root = trans->fs_info->tree_root; 351 350 struct btrfs_path *path; 352 351 struct btrfs_root_ref *ref; 353 352 struct extent_buffer *leaf;