redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

btrfs: Remove fs_info from btrfs_del_root 

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>
hifive-unleashed-5.1
Lu Fengqi 2018-08-01 11:32:27 +08:00 committed by David Sterba
parent 9add29457a
commit ab9ce7d42b
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/ctree.h
View File

@ -2993,7 +2993,7 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans,
u64 root_id, u64 ref_id, u64 dirid, u64 *sequence,
const char *name, int name_len);
int btrfs_del_root(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, const struct btrfs_key *key);
const struct btrfs_key *key);
int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root *root,
const struct btrfs_key *key,
struct btrfs_root_item *item);

2
fs/btrfs/extent-tree.c
View File

@ -9028,7 +9028,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
if (err)
goto out_end_trans;
ret = btrfs_del_root(trans, fs_info, &root->root_key);
ret = btrfs_del_root(trans, &root->root_key);
if (ret) {
btrfs_abort_transaction(trans, ret);
err = ret;

2
fs/btrfs/free-space-tree.c
View File

@ -1236,7 +1236,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
if (ret)
goto abort;
ret = btrfs_del_root(trans, fs_info, &free_space_root->root_key);
ret = btrfs_del_root(trans, &free_space_root->root_key);
if (ret)
goto abort;

2
fs/btrfs/qgroup.c
View File

@ -1088,7 +1088,7 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info)
goto end_trans;
}
ret = btrfs_del_root(trans, fs_info, &quota_root->root_key);
ret = btrfs_del_root(trans, &quota_root->root_key);
if (ret) {
btrfs_abort_transaction(trans, ret);
goto end_trans;

4
fs/btrfs/root-tree.c
View File

@ -320,9 +320,9 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
/* drop the root item for 'key' from the tree root */
int btrfs_del_root(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, const struct btrfs_key *key)
const struct btrfs_key *key)
{
struct btrfs_root *root = fs_info->tree_root;
struct btrfs_root *root = trans->fs_info->tree_root;
struct btrfs_path *path;
int ret;