Commit 7eefae6b authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: pass btrfs_fs_info to btrfs_recover_relocation 



We don't need a root here, we just need the btrfs_fs_info, we can just
get the specific roots we need from fs_info.

Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 33c44184

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -3833,7 +3833,7 @@ int btrfs_init_reloc_root(struct btrfs_trans_handle *trans, 
			  struct btrfs_root *root);

int btrfs_update_reloc_root(struct btrfs_trans_handle *trans,

			    struct btrfs_root *root);

int btrfs_recover_relocation(struct btrfs_root *root);

int btrfs_recover_relocation(struct btrfs_fs_info *fs_info);

int btrfs_reloc_clone_csums(struct btrfs_inode *inode, u64 file_pos, u64 len);

int btrfs_reloc_cow_block(struct btrfs_trans_handle *trans,

			  struct btrfs_root *root, struct extent_buffer *buf,

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -3379,7 +3379,7 @@ int btrfs_start_pre_rw_mount(struct btrfs_fs_info *fs_info) 
	up_read(&fs_info->cleanup_work_sem);



	mutex_lock(&fs_info->cleaner_mutex);

	ret = btrfs_recover_relocation(fs_info->tree_root);

	ret = btrfs_recover_relocation(fs_info);

	mutex_unlock(&fs_info->cleaner_mutex);

	if (ret < 0) {

		btrfs_warn(fs_info, "failed to recover relocation: %d", ret);

fs/btrfs/relocation.c

+2 −3
Original line number Diff line number Diff line
@@ -4123,9 +4123,8 @@ static noinline_for_stack int mark_garbage_root(struct btrfs_root *root) 
 * this function resumes merging reloc trees with corresponding fs trees.

 * this is important for keeping the sharing of tree blocks

 */

int btrfs_recover_relocation(struct btrfs_root *root)

int btrfs_recover_relocation(struct btrfs_fs_info *fs_info)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	LIST_HEAD(reloc_roots);

	struct btrfs_key key;

	struct btrfs_root *fs_root;
@@ -4166,7 +4165,7 @@ int btrfs_recover_relocation(struct btrfs_root *root) 
		    key.type != BTRFS_ROOT_ITEM_KEY)

			break;



		reloc_root = btrfs_read_tree_root(root, &key);

		reloc_root = btrfs_read_tree_root(fs_info->tree_root, &key);

		if (IS_ERR(reloc_root)) {

			err = PTR_ERR(reloc_root);

			goto out;