From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757950AbcILT1o (ORCPT ); Mon, 12 Sep 2016 15:27:44 -0400 Received: from mout.web.de ([212.227.15.14]:56098 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757791AbcILT1j (ORCPT ); Mon, 12 Sep 2016 15:27:39 -0400 Subject: [PATCH 38/47] block-rbd: Rename jump labels in rbd_client_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: Date: Mon, 12 Sep 2016 21:27:29 +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:iyTKAgpAZzQ2q5wVju+YFvrMyfJ2trgEAjcmDfjTXqXTuX6lXSI TW6KMtKLhbXvH8IwBgBdsCVVM/YUX2BCJmHUa4WUFGoo80lBKfqx4iPd77X2XJjg3xAGB1c e9VMD7tgiNckBvqhUBrYOuQHIhcPRqDCpuUpjk8wYkRT2PRrnuTwcMm4Ft/dhgmpo3Z8IXB 6paGCxosKLZRQ8x1M4AfQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:uz4vaNXrTYc=:YUDQr4HOTg2LAEooWdq5Ux hGXbTC4K69Mmu5FtArBI9Gig8VRJAIyN2lFU3OqIjrpEDvjdtMp2zkZvoByODp/fx3gw4gmp6 tse3pe0Yas9JrxkDNzjis/0KMr9GcDJrkRar1+QiHxwBgz4gsWGeHwSK3x4Rj/2f+VNm8mYSM h24nn9Cvs8oPwS9qbpxdPwdXxtVX8wUgnKWnx+vE0WeiwHpxQLyrH2UijMeadDheF4cmwQ3EC BAxFFu67L+Y6d7shGChyhvP4pafj+IcFNqewYTkri1pjscJXMk2RYpMPEK30Y3adXdjNY1Vr4 y1Ghvp8zlmBh4PK+7AHF69wCdYFHzI4oEIajqJOxMMCT/4O8AeXyd8k35ZbpDo/j3T/xXME88 l6AYyl8yw5la6LYWtGB1te/r62oxQPAtwkq+P1chk/DN1Jr+FUyxCow5CQvzFzo0LS60dbeGQ okjT1fButG5S9Ix6r+S57kxUHIhSgulF5GqIUFDy54x3Dgop5AdvGTQIhe0eQx5Aom1SZlFzz KOYbEwaRC76uEtPbgmke6QmXgYyBDAI39gHWst6gpSce2D5F19N3rokFLlAJuIJubIRKKhRye bwrLm6buv5Or16OHlsVwo2zfkb6qMe+3LucRMgzhUR1ci9Aajljm/ePEEdk+CxBT/FGFhO0P5 EXYfBKJOEQxdlD4pw6tFKTST8ww9EXKcFlXz0cwFjGJNVrw5JOswwQOrw5OjkVtMYFIBmmKfj 483RnH7K27k7k8XWmW+vTO+vrhklorlVZ8BGKAcjDNZl8k81J++mMJcWCrGacHWdTWX0fYrnh wYxQD62 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 19:57:19 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index abc2dcb..9902a7f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -718,19 +718,19 @@ static struct rbd_client *rbd_client_create(struct ceph_options *ceph_opts) dout("%s:\n", __func__); rbdc = kmalloc(sizeof(struct rbd_client), GFP_KERNEL); if (!rbdc) - goto out_opt; + goto check_input; kref_init(&rbdc->kref); INIT_LIST_HEAD(&rbdc->node); rbdc->client = ceph_create_client(ceph_opts, rbdc, 0, 0); if (IS_ERR(rbdc->client)) - goto out_rbdc; + goto free_rbdc; ceph_opts = NULL; /* Now rbdc->client is responsible for ceph_opts */ ret = ceph_open_session(rbdc->client); if (ret < 0) - goto out_client; + goto destroy_client; spin_lock(&rbd_client_list_lock); list_add_tail(&rbdc->node, &rbd_client_list); @@ -739,11 +739,11 @@ static struct rbd_client *rbd_client_create(struct ceph_options *ceph_opts) dout("%s: rbdc %p\n", __func__, rbdc); return rbdc; -out_client: + destroy_client: ceph_destroy_client(rbdc->client); -out_rbdc: + free_rbdc: kfree(rbdc); -out_opt: + check_input: if (ceph_opts) ceph_destroy_options(ceph_opts); dout("%s: error %d\n", __func__, ret); -- 2.10.0