leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: get fs_info from trans in btrfs_run_dev_replace

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

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2019-03-20 16:51:44 +01:00
parent 196c9d8de8
commit 2b584c688b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/dev-replace.c
View File

@ -273,9 +273,9 @@ error:
* called from commit_transaction. Writes changed device replace state to * called from commit_transaction. Writes changed device replace state to
* disk. * disk.
*/ */
int btrfs_run_dev_replace(struct btrfs_trans_handle *trans, int btrfs_run_dev_replace(struct btrfs_trans_handle *trans)
struct btrfs_fs_info *fs_info)
{ {
struct btrfs_fs_info *fs_info = trans->fs_info;
int ret; int ret;
struct btrfs_root *dev_root = fs_info->dev_root; struct btrfs_root *dev_root = fs_info->dev_root;
struct btrfs_path *path; struct btrfs_path *path;

3
fs/btrfs/dev-replace.h
View File

@ -9,8 +9,7 @@
struct btrfs_ioctl_dev_replace_args; struct btrfs_ioctl_dev_replace_args;
int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info); int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info);
int btrfs_run_dev_replace(struct btrfs_trans_handle *trans, int btrfs_run_dev_replace(struct btrfs_trans_handle *trans);
struct btrfs_fs_info *fs_info);
int btrfs_dev_replace_by_ioctl(struct btrfs_fs_info *fs_info, int btrfs_dev_replace_by_ioctl(struct btrfs_fs_info *fs_info,
struct btrfs_ioctl_dev_replace_args *args); struct btrfs_ioctl_dev_replace_args *args);
void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info, void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info,

2
fs/btrfs/transaction.c
View File

@ -1097,7 +1097,7 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans)
ret = btrfs_run_dev_stats(trans); ret = btrfs_run_dev_stats(trans);
if (ret) if (ret)
return ret; return ret;
ret = btrfs_run_dev_replace(trans, fs_info); ret = btrfs_run_dev_replace(trans);
if (ret) if (ret)
return ret; return ret;
ret = btrfs_run_qgroups(trans); ret = btrfs_run_qgroups(trans);