btrfs: get fs_info from device in btrfs_rm_dev_item
authorDavid Sterba <dsterba@suse.com>
Wed, 20 Mar 2019 15:31:53 +0000 (16:31 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 29 Apr 2019 17:02:47 +0000 (19:02 +0200)
We can read fs_info from the device and can drop it from the parameters.

Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/volumes.c

index 5ee2487..dcbfd02 100644 (file)
@@ -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;