Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cd5447e authored by Jeff Mahoney's avatar Jeff Mahoney Committed by David Sterba
Browse files

btrfs: pass fs_info to btrfs_del_root instead of tree_root 



btrfs_del_roots always uses the tree_root.  Let's pass fs_info instead.

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 64ecdb64

fs/btrfs/ctree.h

+2 −2
Original line number Diff line number Diff line
@@ -2988,8 +2988,8 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, 
		       struct btrfs_fs_info *fs_info,

		       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_root *root,

		   const struct btrfs_key *key);

int btrfs_del_root(struct btrfs_trans_handle *trans,

		   struct btrfs_fs_info *fs_info, 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);

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -9266,7 +9266,7 @@ int btrfs_drop_snapshot(struct btrfs_root *root, 
	if (err)

		goto out_end_trans;



	ret = btrfs_del_root(trans, tree_root, &root->root_key);

	ret = btrfs_del_root(trans, fs_info, &root->root_key);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		goto out_end_trans;

fs/btrfs/free-space-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -1257,7 +1257,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info) 
	if (ret)

		goto abort;



	ret = btrfs_del_root(trans, tree_root, &free_space_root->root_key);

	ret = btrfs_del_root(trans, fs_info, &free_space_root->root_key);

	if (ret)

		goto abort;

fs/btrfs/qgroup.c

+1 −2
Original line number Diff line number Diff line
@@ -946,7 +946,6 @@ int btrfs_quota_enable(struct btrfs_trans_handle *trans, 
int btrfs_quota_disable(struct btrfs_trans_handle *trans,

			struct btrfs_fs_info *fs_info)

{

	struct btrfs_root *tree_root = fs_info->tree_root;

	struct btrfs_root *quota_root;

	int ret = 0;
@@ -968,7 +967,7 @@ int btrfs_quota_disable(struct btrfs_trans_handle *trans, 
	if (ret)

		goto out;



	ret = btrfs_del_root(trans, tree_root, &quota_root->root_key);

	ret = btrfs_del_root(trans, fs_info, &quota_root->root_key);

	if (ret)

		goto out;

fs/btrfs/root-tree.c

+4 −3
Original line number Diff line number Diff line
@@ -335,10 +335,11 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info) 
	return err;

}



/* drop the root item for 'key' from 'root' */

int btrfs_del_root(struct btrfs_trans_handle *trans, struct btrfs_root *root,

		   const struct btrfs_key *key)

/* 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)

{

	struct btrfs_root *root = fs_info->tree_root;

	struct btrfs_path *path;

	int ret;