diff options
author | Anand Jain <anand.jain@oracle.com> | 2020-09-04 19:34:35 +0200 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2020-10-07 12:12:22 +0200 |
commit | c83b60c0e4d27363e284123afb50ff34f0ea1f1a (patch) | |
tree | 04e30258deafe64617b9f90989be4f10d6d452c0 /fs/btrfs/volumes.c | |
parent | btrfs: remove unnecessary tmp variable in btrfs_assign_next_active_device() (diff) | |
download | linux-c83b60c0e4d27363e284123afb50ff34f0ea1f1a.tar.xz linux-c83b60c0e4d27363e284123afb50ff34f0ea1f1a.zip |
btrfs: simplify gotos in open_seed_device
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>
Diffstat (limited to '')
-rw-r--r-- | fs/btrfs/volumes.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 78b67cc6cec1..6c7c8819cb31 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -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; } |