From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932908AbcILTaW (ORCPT ); Mon, 12 Sep 2016 15:30:22 -0400 Received: from mout.web.de ([212.227.15.14]:55449 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932764AbcILTaS (ORCPT ); Mon, 12 Sep 2016 15:30:18 -0400 Subject: [PATCH 41/47] block-rbd: Rename jump labels in rbd_dev_device_setup() 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: <1b51a821-c06c-4ee5-aff3-d1ed23abdebb@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:30:02 +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:aWcCg2CX0XC0oE1ZcTpJAbnAzaoYH3LOyefqyZsEiEO4G2l5GoT Xu6KtCLthFhfzaXnQMG5RKnA1NQJ6GrILvl5nXuDxbexnTwQGaEzN5f7uPbNassdkpNctyE rma+/Oz0KZpKJReEr6XzurFLsaKv8gTrdtEV5aCMgUc2jS8hVsUeEiVMEUtFOw3ia6rYtnc GewqmCLqLroJlyyrHb2NQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:zakyG72q1hs=:nPFC/XmMVZtjU29Sn7cSe7 Q5og5b5RnKtBZhc9h8x8/O77ti+aGydL4dBp0oQvT24uk9t6uh7705lOZMQzAvDtcuq2RZ5+p 8brTXq1ig4NdRbotSbZyGyhQ7UME/HABKivtuQCsD+7mZfayzlWRGf9PR1OAZdmYGol+mPX+F 8p8xxQzJ5CbfsvpYPT6/6WXmcC0Mp2pd5nv90yLpmi3eXGtxNisetjGNxMFfjnMtBWUTXXYDn s+CKQr0k79xBHnRUum3trMZenl0P038pCiX4Q81IBC0kgUco40LYzhn8pAqLJWDdooLjHMmSB ZlfYSyxDPz3V0Flca9Yc52fEK2+S4wENFJFewP9ALeNO0rMVsUzHAYBwiGpjWnzNNF3fh/0Be 49Vbi8mZTi+NWF1UQXzXWL/aLqecySzaMPQIsDUVvtCrNRbHmxEyJOLs1GKQsmBT1IT1NNci+ tTNx/yZAr12yAaE0pzI4jXBKoJfLabsh7jQu+DgmKe2Ad6symFfN/VRZqk2ZsWpWgodMUZxPc uSYuOTILSEKz2JG7v3Vd9pnoziD2fVOBAaJUV7S/0Q6LHq10nx51VrbGt66aowXxJBtWHp3p8 /k8F9Qy7LvJgC4scIZcw0helW0YzpC/hNNG/EL++XFa3kkz/XVzV5e9Y3Kx8vzE3Ujyws4oUv 9z5RrHNbvJmx7b2N2PDFYQ7ux0y7/Hbybh3x6gGyhdY+ycorJwdV66lqWQ3WdbazCe1oskVAf 9yvYpqA5MORuhHS44PkRoIzhA8etEuoHVBTfa6mvQDHoCFEOdoYyPlyQBgUohr6gVCiowxq9z Rpwl4LZ 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 20:01:03 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index a037a5d..80983f6 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -6002,7 +6002,7 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev) if (!single_major) { ret = register_blkdev(0, rbd_dev->name); if (ret < 0) - goto err_out_unlock; + goto unlock; rbd_dev->major = ret; rbd_dev->minor = 0; @@ -6015,11 +6015,11 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev) ret = rbd_init_disk(rbd_dev); if (ret) - goto err_out_blkdev; + goto check_single; ret = rbd_dev_mapping_set(rbd_dev); if (ret) - goto err_out_disk; + goto free_disk; set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE); set_disk_ro(rbd_dev->disk, rbd_dev->mapping.read_only); @@ -6027,7 +6027,7 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev) dev_set_name(&rbd_dev->dev, "%d", rbd_dev->dev_id); ret = device_add(&rbd_dev->dev); if (ret) - goto err_out_mapping; + goto clear_mapping; /* Everything's ready. Announce the disk to the world. */ @@ -6044,15 +6044,14 @@ static int rbd_dev_device_setup(struct rbd_device *rbd_dev) rbd_dev->header.features); return ret; - -err_out_mapping: + clear_mapping: rbd_dev_mapping_clear(rbd_dev); -err_out_disk: + free_disk: rbd_free_disk(rbd_dev); -err_out_blkdev: + check_single: if (!single_major) unregister_blkdev(rbd_dev->major, rbd_dev->name); -err_out_unlock: + unlock: up_write(&rbd_dev->header_rwsem); return ret; } -- 2.10.0