Re: [PATCH 15/47] block-rbd: Rename jump labels in rbd_dev_create()

Ilya Dryomov
2016-09-13T08:07:46Z

On Mon, Sep 12, 2016 at 9:00 PM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 12 Sep 2016 18:12:39 +0200
>
> Adjust jump labels according to the current Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> drivers/block/rbd.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index 6acddc53..262805a 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -4930,23 +4930,22 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc,
> minor_to_rbd_dev_id(1 << MINORBITS),
> GFP_KERNEL);
> if (rbd_dev->dev_id < 0)
> - goto fail_rbd_dev;
> + goto free_device;
>
> sprintf(rbd_dev->name, RBD_DRV_NAME "%d", rbd_dev->dev_id);
> rbd_dev->task_wq = alloc_ordered_workqueue("%s-tasks", WQ_MEM_RECLAIM,
> rbd_dev->name);
> if (!rbd_dev->task_wq)
> - goto fail_dev_id;
> + goto remove_id;
>
> /* we have a ref from do_rbd_add() */
> __module_get(THIS_MODULE);
>
> dout("%s rbd_dev %p dev_id %d\n", __func__, rbd_dev, rbd_dev->dev_id);
> return rbd_dev;
> -
> -fail_dev_id:
> + remove_id:
> ida_simple_remove(&rbd_dev_id_ida, rbd_dev->dev_id);
> -fail_rbd_dev:
> + free_device:
> rbd_dev_free(rbd_dev);
> return NULL;
> }
> --
> 2.10.0
>

Really? I mean out_err -> free_device I can understand, but this?

Thanks,

Ilya