提交 5c5c0df0 编写于 作者: D David Sterba

btrfs: rename btrfs_find_device_by_user_input

For clarity how we are going to find the device, let's call it a device
specifier, devspec for short. Also rename the arguments that are a
leftover from previous function purpose.
Reviewed-by: NAnand Jain <anand.jain@oracle.com>
Signed-off-by: NDavid Sterba <dsterba@suse.com>
上级 418775a2
...@@ -322,7 +322,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, ...@@ -322,7 +322,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root,
/* the disk copy procedure reuses the scrub code */ /* the disk copy procedure reuses the scrub code */
mutex_lock(&fs_info->volume_mutex); mutex_lock(&fs_info->volume_mutex);
ret = btrfs_find_device_by_user_input(root, args->start.srcdevid, ret = btrfs_find_device_by_devspec(root, args->start.srcdevid,
args->start.srcdev_name, args->start.srcdev_name,
&src_device); &src_device);
if (ret) { if (ret) {
......
...@@ -1780,7 +1780,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid) ...@@ -1780,7 +1780,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid)
if (ret) if (ret)
goto out; goto out;
ret = btrfs_find_device_by_user_input(root, devid, device_path, ret = btrfs_find_device_by_devspec(root, devid, device_path,
&device); &device);
if (ret) if (ret)
goto out; goto out;
...@@ -2065,23 +2065,26 @@ int btrfs_find_device_missing_or_by_path(struct btrfs_root *root, ...@@ -2065,23 +2065,26 @@ 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, * Lookup a device given by device id, or the path if the id is 0.
*/
int btrfs_find_device_by_devspec(struct btrfs_root *root, u64 devid,
char *devpath,
struct btrfs_device **device) struct btrfs_device **device)
{ {
int ret; int ret;
if (srcdevid) { if (devid) {
ret = 0; ret = 0;
*device = btrfs_find_device(root->fs_info, srcdevid, NULL, *device = btrfs_find_device(root->fs_info, devid, NULL,
NULL); NULL);
if (!*device) if (!*device)
ret = -ENOENT; ret = -ENOENT;
} else { } else {
if (!srcdev_name || !srcdev_name[0]) if (!devpath || !devpath[0])
return -EINVAL; return -EINVAL;
ret = btrfs_find_device_missing_or_by_path(root, srcdev_name, ret = btrfs_find_device_missing_or_by_path(root, devpath,
device); device);
} }
return ret; return ret;
......
...@@ -448,8 +448,8 @@ void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step); ...@@ -448,8 +448,8 @@ 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, int btrfs_find_device_missing_or_by_path(struct btrfs_root *root,
char *device_path, char *device_path,
struct btrfs_device **device); struct btrfs_device **device);
int btrfs_find_device_by_user_input(struct btrfs_root *root, u64 srcdevid, int btrfs_find_device_by_devspec(struct btrfs_root *root, u64 devid,
char *srcdev_name, char *devpath,
struct btrfs_device **device); struct btrfs_device **device);
struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info, struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,
const u64 *devid, const u64 *devid,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册