From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757680AbcILTAn (ORCPT ); Mon, 12 Sep 2016 15:00:43 -0400 Received: from mout.web.de ([212.227.15.4]:59346 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755231AbcILTAk (ORCPT ); Mon, 12 Sep 2016 15:00:40 -0400 Subject: [PATCH 15/47] block-rbd: Rename jump labels in rbd_dev_create() To: ceph-devel@vger.kernel.org, Alex Elder , Ilya Dryomov , Sage Weil References: <566ABCD9.1060404@users.sourceforge.net> <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <475899b2-a0fc-7bd9-43fe-c83c390158ff@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:00:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:QpVtjhOUitzCDej/Ym950KwjPdHLBhdvbYYkSXZze1c0nIOfEg9 GsXFpy+KP8s1otafGSIaOtcrAJ2DjupSAVcGryPMrPv7LWID7ib3doVgD7K6M043Y7haWUw hQGRpxVw905eQlAdxmMM3bq9zhH8OnMA3Z+c6HYz9ql6EvNORxLFc8FHeInpHHL7OhEZEvv /7sqq1eOkJF66aCtBqX6A== X-UI-Out-Filterresults: notjunk:1;V01:K0:UKbIQn3GKlw=:eMDTAsxQ0EeQHeBsIUJQKc mW6qQgLQb/0u1UuG0dyG4eoIeaiwcBshzXfI8nQfmx6Cl9mMd58ekeD2+Y6As5EVO/I3qCSCq IyujeaMCxKvKkECT6z1VjRzOZKhRAIkRXK+Oe7ih9ZvgSYzgDIBtqmX0mClq0yIljpXE91vhJ IvXdtptOKQnqHe4RMTi0gDpqdbnbRcMIw2UQs3894GZ8kjC4oyKih+maBVQgvbr0mCBvLkHG6 DVPn2mmmFR9uQepFnXjW+c7P/5V1GbJcBY03mj73iJGtsoo6TN82pP61ro0+CqKNglR52FxXl ikRNoY/LVzNVNnKYU6KogJUd70B+ZF7lA1+9ksX7N1Z5wDsskfK41cvb39/FSLOhdgMou4ult HC56mMtq6AOTsECUUhLaGCihNJTzOssgc4caVQMlS7NPMgAlOvhoQ+OOg4t7FvBuCt2qV+ZsA idJ/NS9IbjQ5FLa4GBLKFWRTREqmDoopOcCvgMCLFD5WvjqufHx9h0+9C4SVbfV1f0FkO2z/J wCUAkcSAPVT0223jX5uBebXcce2BOQziTVBeIIhKP+JH0kTCBNPZ25cFOADq86y9kXs/Qu8VC IGkgczjcn2UldMj/ZCCNVmSaHAtqqeLsgY0pciN2Cpmk3oR024oHCPK5yZSjtIHA5Sll2CaQY 1XbPFKP5hqD3MEShiGN8Ht6kQbz0qQoOAxC7nUhnEMoag/BMA08cr5lIrnaJRw3Abq2q3pTKB K5jsRFn1/axEIR8VGzLOuHGZM73VNZYUALZ/qT/0LW7Y16t1sM7F71vIk8P5izjU6bXwCkeg2 +3Nj3pM Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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