btrfs_find_device_by_devspec() finds the device by @devid or by
@device_path. This patch makes code flow easy to read by open
coding the else part and renames devpath to device_path.
Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
If the else is preferred, I am ok to keep them. Nikolay?
fs/btrfs/volumes.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index e92404081e25..8b5201c734b9 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2435,7 +2435,8 @@ static struct btrfs_device *btrfs_find_device_by_path(
* Lookup a device given by device id, or the path if the id is 0.
*/
struct btrfs_device *btrfs_find_device_by_devspec(
- struct btrfs_fs_info *fs_info, u64 devid, const char *devpath)
+ struct btrfs_fs_info *fs_info, u64 devid,
+ const char *device_path)
{
struct btrfs_device *device;
@@ -2443,24 +2444,23 @@ struct btrfs_device *btrfs_find_device_by_devspec(
device = btrfs_find_device(fs_info, devid, NULL, NULL);
if (!device)
return ERR_PTR(-ENOENT);
- } else {
- if (!devpath || !devpath[0])
- return ERR_PTR(-EINVAL);
-
- 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;
+ }
+
+ if (!device_path || !device_path[0])
+ return ERR_PTR(-EINVAL);
+
+ if (strcmp(device_path, "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);
}
- return device;
+
+ return btrfs_find_device_by_path(fs_info, device_path);
}
/*
--
1.8.3.1
