leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs: refactor find_device helper

Browse Source 
Polish the helper:
* drop underscores, no special meaning here
* pass fs_devices, as this is what the API implements
* drop noinline, no apparent reason for such simple helper
* constify uuid
* add comment

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-06-15 19:51:51 +02:00
parent 2dfeca9bfb
commit 35c70103a5
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/btrfs/volumes.c
View File

@ -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,7 +629,7 @@ static noinline int device_list_add(const char *path,
device = NULL; device = NULL;
} else { } else {
device = __find_device(&fs_devices->devices, devid, device = find_device(fs_devices, devid,
disk_super->dev_item.uuid); disk_super->dev_item.uuid);
} }
@ -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, device = find_device(cur_devices, devid, uuid);
devid, uuid);
if (device) if (device)
return device; return device;
} }