diff options
| author | Anand Jain <anand.jain@oracle.com> | 2023-05-24 20:02:37 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2023-06-19 13:59:29 +0200 |
| commit | c6930d7d11e30f55dee1e306bc3a3105fde56f93 (patch) | |
| tree | fd2bbc901c8d8ed1ec4975ad81ee30e27083ef33 /fs | |
| parent | 19c4c49ca9d0eb14987386598e44a533a367f745 (diff) | |
| download | linux-stable-c6930d7d11e30f55dee1e306bc3a3105fde56f93.tar.gz linux-stable-c6930d7d11e30f55dee1e306bc3a3105fde56f93.tar.bz2 linux-stable-c6930d7d11e30f55dee1e306bc3a3105fde56f93.zip | |
btrfs: merge calls to alloc_fs_devices in device_list_add
Simplify has_metadata_uuid checks - by localizing the has_metadata_uuid
checked within alloc_fs_devices()'s second argument, it improves the
code readability.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/volumes.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index c98b45c350db..de60a55dd7d3 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -791,12 +791,8 @@ static noinline struct btrfs_device *device_list_add(const char *path, if (!fs_devices) { - if (has_metadata_uuid) - fs_devices = alloc_fs_devices(disk_super->fsid, - disk_super->metadata_uuid); - else - fs_devices = alloc_fs_devices(disk_super->fsid, NULL); - + fs_devices = alloc_fs_devices(disk_super->fsid, + has_metadata_uuid ? disk_super->metadata_uuid : NULL); if (IS_ERR(fs_devices)) return ERR_CAST(fs_devices); |