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: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index fdd2880707df45ba755614a2eb90e4dd1ead32f9..b7f5f4aa6e86bd468bd2eebb796afc25e9bde94e 100644 (file)
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -322,7 +322,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_find_device_by_user_input(root, args->start.srcdevid,
+       ret = btrfs_find_device_by_devspec(root, args->start.srcdevid,
                                            args->start.srcdev_name,
                                            &src_device);
        if (ret) {

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 055fbebea1991f8572a26a15e962ff56994443fc..e43b01e438b15311cbbff2782256cf9efe7935d6 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1780,7 +1780,7 @@ int btrfs_rm_device(struct btrfs_root *root, char *device_path, u64 devid)
        if (ret)
                goto out;
 
-       ret = btrfs_find_device_by_user_input(root, devid, device_path,
+       ret = btrfs_find_device_by_devspec(root, devid, device_path,
                                &device);
        if (ret)
                goto out;
@@ -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)
 {
        int ret;
 
-       if (srcdevid) {
+       if (devid) {
                ret = 0;
-               *device = btrfs_find_device(root->fs_info, srcdevid, NULL,
+               *device = btrfs_find_device(root->fs_info, devid, NULL,
                                            NULL);
                if (!*device)
                        ret = -ENOENT;
        } else {
-               if (!srcdev_name || !srcdev_name[0])
+               if (!devpath || !devpath[0])
                        return -EINVAL;
 
-               ret = btrfs_find_device_missing_or_by_path(root, srcdev_name,
+               ret = btrfs_find_device_missing_or_by_path(root, devpath,
                                                           device);
        }
        return ret;

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index a13a538cb01e91089cd733980e0f13e29931f446..febdb7bc93704bae06d809bca5068a5f60ca5375 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -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,
                                         char *device_path,
                                         struct btrfs_device **device);
-int btrfs_find_device_by_user_input(struct btrfs_root *root, u64 srcdevid,
-                                        char *srcdev_name,
+int btrfs_find_device_by_devspec(struct btrfs_root *root, u64 devid,
+                                        char *devpath,
                                         struct btrfs_device **device);
 struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,
                                        const u64 *devid,