]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
btrfs: simplify gotos in open_seed_device
authorAnand Jain <anand.jain@oracle.com>
Fri, 4 Sep 2020 17:34:35 +0000 (01:34 +0800)
committerDavid Sterba <dsterba@suse.com>
Wed, 7 Oct 2020 10:12:22 +0000 (12:12 +0200)
The function does not have a common exit block and returns immediatelly
so there's no point having the goto. Remove the two cases.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/volumes.c

index 78b67cc6cec1318e8aef7e3ae558582b6a780ab0..6c7c8819cb31f68bb786ed9da30b65c6a7c8df5c 100644 (file)
@@ -6753,19 +6753,17 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_fs_info *fs_info,
        ret = open_fs_devices(fs_devices, FMODE_READ, fs_info->bdev_holder);
        if (ret) {
                free_fs_devices(fs_devices);
-               fs_devices = ERR_PTR(ret);
-               goto out;
+               return ERR_PTR(ret);
        }
 
        if (!fs_devices->seeding) {
                close_fs_devices(fs_devices);
                free_fs_devices(fs_devices);
-               fs_devices = ERR_PTR(-EINVAL);
-               goto out;
+               return ERR_PTR(-EINVAL);
        }
 
        list_add(&fs_devices->seed_list, &fs_info->fs_devices->seed_list);
-out:
+
        return fs_devices;
 }