Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5112febb authored by Jeff Mahoney's avatar Jeff Mahoney Committed by David Sterba
Browse files

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: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6bccf3ab

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -2672,7 +2672,7 @@ static long btrfs_ioctl_add_dev(struct btrfs_root *root, void __user *arg) 
	}



	vol_args->name[BTRFS_PATH_NAME_MAX] = '\0';

	ret = btrfs_init_new_device(root, vol_args->name);

	ret = btrfs_init_new_device(root->fs_info, vol_args->name);



	if (!ret)

		btrfs_info(root->fs_info, "disk added %s",vol_args->name);

fs/btrfs/volumes.c

+2 −1
Original line number Diff line number Diff line
@@ -2310,8 +2310,9 @@ static int btrfs_finish_sprout(struct btrfs_trans_handle *trans, 
	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;

fs/btrfs/volumes.h

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ int btrfs_grow_device(struct btrfs_trans_handle *trans, 
struct btrfs_device *btrfs_find_device(struct btrfs_fs_info *fs_info, u64 devid,

				       u8 *uuid, u8 *fsid);

int btrfs_shrink_device(struct btrfs_device *device, u64 new_size);

int btrfs_init_new_device(struct btrfs_root *root, char *path);

int btrfs_init_new_device(struct btrfs_fs_info *fs_info, char *path);

int btrfs_init_dev_replace_tgtdev(struct btrfs_root *root, char *device_path,

				  struct btrfs_device *srcdev,

				  struct btrfs_device **device_out);