From patchwork Mon Sep 12 19:32:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9327863 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1EA5A60231 for ; Mon, 12 Sep 2016 19:32:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10B5728E93 for ; Mon, 12 Sep 2016 19:32:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0377E28E98; Mon, 12 Sep 2016 19:32:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E82F28E6E for ; Mon, 12 Sep 2016 19:32:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932765AbcILTc1 (ORCPT ); Mon, 12 Sep 2016 15:32:27 -0400 Received: from mout.web.de ([212.227.15.14]:52786 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932538AbcILTcP (ORCPT ); Mon, 12 Sep 2016 15:32:15 -0400 Received: from [192.168.1.3] ([77.182.57.148]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0MhDRB-1bNLPA3sll-00MHpi; Mon, 12 Sep 2016 21:32:06 +0200 Subject: [PATCH 43/47] block-rbd: Rename jump labels in do_rbd_add() 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: <01943784-1031-d517-0d97-0a61e12e730f@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:32:05 +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> X-Provags-ID: V03:K0:bxDDP8bSXe/e37Sgg5tMnZH2Lt839lu65dsUmbanXyyaCewv6WV HTQ9By3qTVRj6y3c30AhP0DT2FVrcaxQXgQZdKIkZ2Un4SFisik//hB5GqTsrnTX/wCsn75 1vU7vUsW6PhT1/jiRbrtj/AsEQmFyNSNNpbtKoLu23cuhW8OHVJkBzEy/rp4sbMjtWX2s6h OSlQbrGXyDjMiTiangsSQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:ql8/xQZCIRk=:QAynLla2vzE01n4eiShveY xZFR/R2yfFNp+g4JQ0KBtCykA+TP6NAyvFFn8oODLfbRH731jGy7kOUAzhuGIa+2vRkbxjZiG yR7dbcdA67Vnmbjo1J2tNPEwUIZlBPlMGVXW42vPL3niLJ7GC10WcNAr9iqiKr4gPYRVvAD8f cLHe7oC5p2vfpfjbja7yjO1Go4RVsyQ2lAttOU29QF6vb0rP2KeJUIs9eA9aZOoTIRVV2sxrs TYOyaO9w5o0cd5nCxovU8uJI7yJLB2CnxTgWCUW4bVerb2HmU5Ii1nAklUrCNcRbcOS6NH3zR /TEKfIdNG31epiaYkRIsRrL4VDwUNm1/cmipaVC7p/NaUGS1wj6sfD3FnOY8SlzmAJFCdOgIt ++zQqeBBTAgARoyfhpQVP09ntJ3LRWkhH3Hak+j7jN8nLzlK2P6ll9TK+Vv0Z2BL3ETWxFr5U S4r98U6sJpWCCl/cPKSFxWcDL6F0oxU12yuePlJMoiTYyA5u1z88zCFmJ24yVwM6dcm4glk4S 6RvGC50YS8G//QwlR9ZdLSjqjmxtpRcJM9c7FwE8xs2w3l5X70RG7BIWMaVNPbSrnUunyYssE /keYkpTNRe1Am5CCQbR4LrnhmSbFwJqXswkwf0aJhYqKyt4SDBc5iGk71/WN55wrwE6q+1YNi Nh49KslS2BH+dKjCiJDcwkU/ZpQ5ZTqy7iES9FUUHUDkQldSZT1WdClh6RunjswS4TxfYdEM9 taNh6dcSW6np4rnX6PYKGVbXs0znoa4tioms/bPV7oB1OiaxKcqpfpp2tMvtWXorUOcWxXQk1 UAP1CDV Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Mon, 12 Sep 2016 20:03:34 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index eec41ed..7df0b90 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -6195,12 +6195,12 @@ static ssize_t do_rbd_add(struct bus_type *bus, /* parse add command */ rc = rbd_add_parse_args(buf, &ceph_opts, &rbd_opts, &spec); if (rc < 0) - goto out; + goto put_module; rbdc = rbd_get_client(ceph_opts); if (IS_ERR(rbdc)) { rc = PTR_ERR(rbdc); - goto err_out_args; + goto put_spec; } /* pick the pool */ @@ -6208,14 +6208,14 @@ static ssize_t do_rbd_add(struct bus_type *bus, if (rc < 0) { if (rc == -ENOENT) pr_info("pool %s does not exist\n", spec->pool_name); - goto err_out_client; + goto put_client; } spec->pool_id = (u64)rc; rbd_dev = rbd_dev_create(rbdc, spec, rbd_opts); if (!rbd_dev) { rc = -ENOMEM; - goto err_out_client; + goto put_client; } rbdc = NULL; /* rbd_dev now owns this */ spec = NULL; /* rbd_dev now owns this */ @@ -6224,14 +6224,14 @@ static ssize_t do_rbd_add(struct bus_type *bus, rbd_dev->config_info = kstrdup(buf, GFP_KERNEL); if (!rbd_dev->config_info) { rc = -ENOMEM; - goto err_out_rbd_dev; + goto destroy_device; } down_write(&rbd_dev->header_rwsem); rc = rbd_dev_image_probe(rbd_dev, 0); if (rc < 0) { up_write(&rbd_dev->header_rwsem); - goto err_out_rbd_dev; + goto destroy_device; } /* If we are mapping a snapshot it must be marked read-only */ @@ -6250,22 +6250,21 @@ static ssize_t do_rbd_add(struct bus_type *bus, */ rbd_unregister_watch(rbd_dev); rbd_dev_image_release(rbd_dev); - goto out; + goto put_module; } rc = count; -out: + put_module: module_put(THIS_MODULE); return rc; - -err_out_rbd_dev: + destroy_device: rbd_dev_destroy(rbd_dev); -err_out_client: + put_client: rbd_put_client(rbdc); -err_out_args: + put_spec: rbd_spec_put(spec); kfree(rbd_opts); - goto out; + goto put_module; } static ssize_t rbd_add(struct bus_type *bus,