summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorJeff Mahoney2016-06-22 02:16:08 +0200
committerDavid Sterba2016-12-06 16:06:57 +0100
commit5112febbc772830f8b1a981570d75c8cb4b93a36 (patch)
tree06d9e9b1907835aa5eb71d0d22d020ee82952495 /fs/btrfs/volumes.c
parentbtrfs: call functions that always use the same root with fs_info instead (diff)
downloadkernel-qcow2-linux-5112febbc772830f8b1a981570d75c8cb4b93a36.tar.gz
kernel-qcow2-linux-5112febbc772830f8b1a981570d75c8cb4b93a36.tar.xz
kernel-qcow2-linux-5112febbc772830f8b1a981570d75c8cb4b93a36.zip
btrfs: btrfs_init_new_device should use fs_info->dev_root
btrfs_init_new_device only uses the root passed in via the ioctl to start the transaction. Nothing else that happens is related to whatever root the user used to initiate the ioctl. We can drop the root requirement and just use fs_info->dev_root instead. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
-rw-r--r--fs/btrfs/volumes.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 99a81369e43d..1622dc7eab91 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2310,8 +2310,9 @@ error:
return ret;
}
-int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
+int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *device_path)
{
+ struct btrfs_root *root = fs_info->dev_root;
struct request_queue *q;
struct btrfs_trans_handle *trans;
struct btrfs_device *device;