diff options
| author | David Sterba <dsterba@suse.com> | 2019-03-20 16:31:53 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-04-29 19:02:47 +0200 |
| commit | f331a9525f96c8f24e33b368521dfdeed3cb6f9d (patch) | |
| tree | 34fda5ccbeba93377cb495412544659ab6cd982b | |
| parent | 8087c193450b29c80c8e8b62050de9d0999e20cf (diff) | |
| download | linux-f331a9525f96c8f24e33b368521dfdeed3cb6f9d.tar.bz2 | |
btrfs: get fs_info from device in btrfs_rm_dev_item
We can read fs_info from the device and can drop it from the parameters.
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/volumes.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 5ee24876fac3..dcbfd027fdf6 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1941,10 +1941,9 @@ static void update_dev_time(const char *path_name) filp_close(filp, NULL); } -static int btrfs_rm_dev_item(struct btrfs_fs_info *fs_info, - struct btrfs_device *device) +static int btrfs_rm_dev_item(struct btrfs_device *device) { - struct btrfs_root *root = fs_info->chunk_root; + struct btrfs_root *root = device->fs_info->chunk_root; int ret; struct btrfs_path *path; struct btrfs_key key; @@ -2145,7 +2144,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path, * counter although write_all_supers() is not locked out. This * could give a filesystem state which requires a degraded mount. */ - ret = btrfs_rm_dev_item(fs_info, device); + ret = btrfs_rm_dev_item(device); if (ret) goto error_undo; |