btrfs: merge btrfs_find_device_missing_or_by_path() into parent

btrfs_find_device_missing_or_by_path() is relatively small function, and
its only parent btrfs_find_device_by_devspec() is small as well. Besides
there are a number of find_device functions. Merge
btrfs_find_device_missing_or_by_path() into its parent.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 15561926ab32cbc8c0ba8a4006fcb8a45e87e6d5..61432eefb1dcf1708e73df1529d155a91a60717b 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2398,32 +2398,6 @@ static struct btrfs_device *btrfs_find_device_by_path(
        return device;
 }
 
-static struct btrfs_device *btrfs_find_device_missing_or_by_path(
-               struct btrfs_fs_info *fs_info, const char *device_path)
-{
-       struct btrfs_device *device = NULL;
-       if (strcmp(device_path, "missing") == 0) {
-               struct list_head *devices;
-               struct btrfs_device *tmp;
-
-               devices = &fs_info->fs_devices->devices;
-               list_for_each_entry(tmp, devices, dev_list) {
-                       if (test_bit(BTRFS_DEV_STATE_IN_FS_METADATA,
-                                       &tmp->dev_state) && !tmp->bdev) {
-                               device = tmp;
-                               break;
-                       }
-               }
-
-               if (!device)
-                       return ERR_PTR(-ENOENT);
-       } else {
-               device = btrfs_find_device_by_path(fs_info, device_path);
-       }
-
-       return device;
-}
-
 /*
  * Lookup a device given by device id, or the path if the id is 0.
  */
@@ -2439,7 +2413,19 @@ struct btrfs_device *btrfs_find_device_by_devspec(
        } else {
                if (!devpath || !devpath[0])
                        return ERR_PTR(-EINVAL);
-               device = btrfs_find_device_missing_or_by_path(fs_info, devpath);
+
+               if (strcmp(devpath, "missing") == 0) {
+                       list_for_each_entry(device, &fs_info->fs_devices->devices,
+                                           dev_list) {
+                               if (test_bit(BTRFS_DEV_STATE_IN_FS_METADATA,
+                                            &device->dev_state) &&
+                                            !device->bdev)
+                                       return device;
+                       }
+                       return ERR_PTR(-ENOENT);
+               } else {
+                       device = btrfs_find_device_by_path(fs_info, devpath);
+               }
        }
        return device;
 }