Re: [PATCH v2 3/3] btrfs: pass btrfs_fs_info to btrfs_recover_relocation

[Filipe Manana <fdmanana@kernel.org>]

On Fri, Feb 18, 2022 at 02:56:12PM -0500, Josef Bacik wrote:
> 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.
> 
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>

Reviewed-by: Filipe Manana <fdmanana@suse.com>

Looks good, thanks.


> ---
>  fs/btrfs/ctree.h      | 2 +-
>  fs/btrfs/disk-io.c    | 2 +-
>  fs/btrfs/relocation.c | 5 ++---
>  3 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
> index 1e238748dc73..ca411a42bccf 100644
> --- a/fs/btrfs/ctree.h
> +++ b/fs/btrfs/ctree.h
> @@ -3845,7 +3845,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,
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index 183baeffd9c9..6a0b4dbd70e9 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -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);
> diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
> index f528c5283f25..7dc6f29a6094 100644
> --- a/fs/btrfs/relocation.c
> +++ b/fs/btrfs/relocation.c
> @@ -4124,9 +4124,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;
> @@ -4167,7 +4166,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;
> -- 
> 2.26.3
>