Commit 2b584c68 authored by David Sterba's avatar David Sterba
Browse files

btrfs: get fs_info from trans in btrfs_run_dev_replace 



We can read fs_info from the transaction and can drop it from the
parameters.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 196c9d8d

fs/btrfs/dev-replace.c

+2 −2
Original line number Diff line number Diff line
@@ -273,9 +273,9 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, 
 * called from commit_transaction. Writes changed device replace state to

 * disk.

 */

int btrfs_run_dev_replace(struct btrfs_trans_handle *trans,

			  struct btrfs_fs_info *fs_info)

int btrfs_run_dev_replace(struct btrfs_trans_handle *trans)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	int ret;

	struct btrfs_root *dev_root = fs_info->dev_root;

	struct btrfs_path *path;

fs/btrfs/dev-replace.h

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ 
struct btrfs_ioctl_dev_replace_args;



int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info);

int btrfs_run_dev_replace(struct btrfs_trans_handle *trans,

			  struct btrfs_fs_info *fs_info);

int btrfs_run_dev_replace(struct btrfs_trans_handle *trans);

int btrfs_dev_replace_by_ioctl(struct btrfs_fs_info *fs_info,

			    struct btrfs_ioctl_dev_replace_args *args);

void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info,

fs/btrfs/transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans) 
	ret = btrfs_run_dev_stats(trans);

	if (ret)

		return ret;

	ret = btrfs_run_dev_replace(trans, fs_info);

	ret = btrfs_run_dev_replace(trans);

	if (ret)

		return ret;

	ret = btrfs_run_qgroups(trans);