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

Commit 24e0474b authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: create helper btrfs_find_device_by_user_input() 



The patch renames btrfs_dev_replace_find_srcdev() to
btrfs_find_device_by_user_input() and moves it to volumes.c, so that
delete device can use it.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent bd45ffbc

fs/btrfs/dev-replace.c

+1 −23
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ static void btrfs_dev_replace_update_device_in_mapping_tree( 
						struct btrfs_fs_info *fs_info,

						struct btrfs_device *srcdev,

						struct btrfs_device *tgtdev);

static int btrfs_dev_replace_find_srcdev(struct btrfs_root *root, u64 srcdevid,

					 char *srcdev_name,

					 struct btrfs_device **device);

static u64 __btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info);

static int btrfs_dev_replace_kthread(void *data);

static int btrfs_dev_replace_continue_on_mount(struct btrfs_fs_info *fs_info);
@@ -329,7 +326,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, 


	/* the disk copy procedure reuses the scrub code */

	mutex_lock(&fs_info->volume_mutex);

	ret = btrfs_dev_replace_find_srcdev(root, args->start.srcdevid,

	ret = btrfs_find_device_by_user_input(root, args->start.srcdevid,

					    args->start.srcdev_name,

					    &src_device);

	if (ret) {
@@ -626,25 +623,6 @@ static void btrfs_dev_replace_update_device_in_mapping_tree( 
	write_unlock(&em_tree->lock);

}



static int btrfs_dev_replace_find_srcdev(struct btrfs_root *root, u64 srcdevid,

					 char *srcdev_name,

					 struct btrfs_device **device)

{

	int ret;



	if (srcdevid) {

		ret = 0;

		*device = btrfs_find_device(root->fs_info, srcdevid, NULL,

					    NULL);

		if (!*device)

			ret = -ENOENT;

	} else {

		ret = btrfs_find_device_missing_or_by_path(root, srcdev_name,

							   device);

	}

	return ret;

}



void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info,

			      struct btrfs_ioctl_dev_replace_args *args)

{

fs/btrfs/volumes.c

+19 −0
Original line number Diff line number Diff line
@@ -2126,6 +2126,25 @@ int btrfs_find_device_missing_or_by_path(struct btrfs_root *root, 
	}

}



int btrfs_find_device_by_user_input(struct btrfs_root *root, u64 srcdevid,

					 char *srcdev_name,

					 struct btrfs_device **device)

{

	int ret;



	if (srcdevid) {

		ret = 0;

		*device = btrfs_find_device(root->fs_info, srcdevid, NULL,

					    NULL);

		if (!*device)

			ret = -ENOENT;

	} else {

		ret = btrfs_find_device_missing_or_by_path(root, srcdev_name,

							   device);

	}

	return ret;

}



/*

 * does all the dirty work required for changing file system's UUID.

 */

fs/btrfs/volumes.h

+3 −0
Original line number Diff line number Diff line
@@ -448,6 +448,9 @@ void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step); 
int btrfs_find_device_missing_or_by_path(struct btrfs_root *root,

					 char *device_path,

					 struct btrfs_device **device);

int btrfs_find_device_by_user_input(struct btrfs_root *root, u64 srcdevid,

					 char *srcdev_name,

					 struct btrfs_device **device);

struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,

					const u64 *devid,

					const u8 *uuid);