Commit c6930d7d authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

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: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 19c4c49c

fs/btrfs/volumes.c

+2 −6
Original line number Diff line number Diff line
@@ -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);



				has_metadata_uuid ? disk_super->metadata_uuid : NULL);

		if (IS_ERR(fs_devices))

			return ERR_CAST(fs_devices);