|
@@ -254,9 +254,17 @@ static struct btrfs_device *__alloc_device(void)
|
|
return dev;
|
|
return dev;
|
|
}
|
|
}
|
|
|
|
|
|
-static noinline struct btrfs_device *__find_device(struct list_head *head,
|
|
|
|
- u64 devid, u8 *uuid)
|
|
|
|
|
|
+/*
|
|
|
|
+ * Find a device specified by @devid or @uuid in the list of @fs_devices, or
|
|
|
|
+ * return NULL.
|
|
|
|
+ *
|
|
|
|
+ * If devid and uuid are both specified, the match must be exact, otherwise
|
|
|
|
+ * only devid is used.
|
|
|
|
+ */
|
|
|
|
+static struct btrfs_device *find_device(struct btrfs_fs_devices *fs_devices,
|
|
|
|
+ u64 devid, const u8 *uuid)
|
|
{
|
|
{
|
|
|
|
+ struct list_head *head = &fs_devices->devices;
|
|
struct btrfs_device *dev;
|
|
struct btrfs_device *dev;
|
|
|
|
|
|
list_for_each_entry(dev, head, dev_list) {
|
|
list_for_each_entry(dev, head, dev_list) {
|
|
@@ -621,8 +629,8 @@ static noinline int device_list_add(const char *path,
|
|
|
|
|
|
device = NULL;
|
|
device = NULL;
|
|
} else {
|
|
} else {
|
|
- device = __find_device(&fs_devices->devices, devid,
|
|
|
|
- disk_super->dev_item.uuid);
|
|
|
|
|
|
+ device = find_device(fs_devices, devid,
|
|
|
|
+ disk_super->dev_item.uuid);
|
|
}
|
|
}
|
|
|
|
|
|
if (!device) {
|
|
if (!device) {
|
|
@@ -6236,8 +6244,7 @@ struct btrfs_device *btrfs_find_device(struct btrfs_fs_info *fs_info, u64 devid,
|
|
while (cur_devices) {
|
|
while (cur_devices) {
|
|
if (!fsid ||
|
|
if (!fsid ||
|
|
!memcmp(cur_devices->fsid, fsid, BTRFS_UUID_SIZE)) {
|
|
!memcmp(cur_devices->fsid, fsid, BTRFS_UUID_SIZE)) {
|
|
- device = __find_device(&cur_devices->devices,
|
|
|
|
- devid, uuid);
|
|
|
|
|
|
+ device = find_device(cur_devices, devid, uuid);
|
|
if (device)
|
|
if (device)
|
|
return device;
|
|
return device;
|
|
}
|
|
}
|