On 4.10.19 г. 10:50 ч., Anand Jain wrote:
> There is no need of goto out in open_fs_devices() as there is nothing
> special done at %out:. So refactor it.
>
> Signed-off-by: Anand Jain <anand.j...@oracle.com>
Reviewed-by: Nikolay Borisov <nbori...@suse.com>
> ---
> fs/btrfs/volumes.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index e176346afed1..06ec3577c6b4 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -1330,7 +1330,6 @@ static int open_fs_devices(struct btrfs_fs_devices
> *fs_devices,
> {
> struct btrfs_device *device;
> struct btrfs_device *latest_dev = NULL;
> - int ret = 0;
>
> flags |= FMODE_EXCL;
>
> @@ -1343,15 +1342,14 @@ static int open_fs_devices(struct btrfs_fs_devices
> *fs_devices,
> device->generation > latest_dev->generation)
> latest_dev = device;
> }
> - if (fs_devices->open_devices == 0) {
> - ret = -EINVAL;
> - goto out;
> - }
> + if (fs_devices->open_devices == 0)
> + return -EINVAL;
> +
> fs_devices->opened = 1;
> fs_devices->latest_bdev = latest_dev->bdev;
> fs_devices->total_rw_bytes = 0;
> -out:
> - return ret;
> +
> + return 0;
> }
>
> static int devid_cmp(void *priv, struct list_head *a, struct list_head *b)
>
