From patchwork Mon Sep 12 19:09:32 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: 9327715 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 9F4B56048B for ; Mon, 12 Sep 2016 19:10:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8924D283FE for ; Mon, 12 Sep 2016 19:10:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7849F28409; Mon, 12 Sep 2016 19:10:01 +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 22B1124B48 for ; Mon, 12 Sep 2016 19:10:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756273AbcILTJz (ORCPT ); Mon, 12 Sep 2016 15:09:55 -0400 Received: from mout.web.de ([212.227.15.14]:64792 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752337AbcILTJx (ORCPT ); Mon, 12 Sep 2016 15:09:53 -0400 Received: from [192.168.1.3] ([77.182.57.148]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0M3Slc-1asWRr2PIG-00r2Tv; Mon, 12 Sep 2016 21:09:35 +0200 Subject: [PATCH 23/47] block-rbd: Rename jump labels in get_lock_owner_info() 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:09:32 +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:JzLLR6AqStJe+g0oPsAPdfqw4S86yc2du9apBv2cquLtM/mndNj 6MZ5eeJydXsvl1/FB8t2HouE+RiNxygUNLyfBmtBVcYuW5B/G6l+j50jDqqQF1pDdI1XNAU RxJMkSi/9AmmrYVYULc3wc1V7MBBM2s1M4AoJOk15GQYsH8mMWC0PYuXtSs7PUPeCPKxJld 5QwypSlB6Z34nKWaTA7OA== X-UI-Out-Filterresults: notjunk:1; V01:K0:wwSB6HRiJhs=:+A0p4XAn0EhqJlnMrncwcX VLiq3JmCXgL3UryGD6QB62AHoVssH5s/hYXtm5fLvkXcFFquOHf2xtu0M5EJ/x4SzO4mqJZOX XlTH5+NgBFsFuhqfzplo77WLECx7u33gpDfQrKdevHx9CZwk8OxgDPO9vNdFKtriMcJPYud95 CnzlKiBdKKhv/ZZje0tOf8JO/ELoimgArnS0suBGvEo4QAIUifACPrFQBaOAbq2KVg4giXcR5 ESgpFGsEepBwWFTtZgBG6RXm3rRjkNFu7NWGfGGq3PHJMC1DqS62GvLqten/pBUQkG9zAqJZ2 mFf7nWH9dSEmE+icO5EI/1CvQoDvBl/X91VeJTQg8vvmOwD4ZaLkbWZ4jys2vICXEnUOa2tH/ qFQ40CtOQGIXsPQlPngW68VMcrlnff+xdjK26R1j8npK7FQgG5JE0/1eEyZRVJotuItVNaHx6 F/5nGXHGsSv+CXbiak9pFFofn+9tww8+EMbCqY5/rgBeUQ3LgrItw7mKrV0RZhi/JTMFMDKEg DtbMqQwxbUCLUNVJDabSs+gWv6mwEBFG4v6Sg8d4b3N2xw1VX6izApbKT6hqhtRe39AMUpJhT QcKpkneS9sTyrH7a9WoTUtJVxhdgaib7/+594kNYt7Fsp2CcqX5WERIJcnVlW7DjZ+y1Sr2tT n/R2X8IWnHs3PF+tyAgFKnGvG1utftWnZF2cvpr/gpA/Mi4PUM2s3ISCOo6Tji/cS+usWxRHt naRuHihupnbgUiPBvWQG91NcV0vr/o8bs3hCulNPU1fWHO2pT5D25Ns1WMPq1u/PBKVspaCAu +SETgTl 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 19:37:52 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index ba8fb74..e175d21 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3381,20 +3381,20 @@ static int get_lock_owner_info(struct rbd_device *rbd_dev, if (*num_lockers == 0) { dout("%s rbd_dev %p no lockers detected\n", __func__, rbd_dev); - goto out; + goto free_tag; } if (strcmp(lock_tag, RBD_LOCK_TAG)) { rbd_warn(rbd_dev, "locked by external mechanism, tag %s", lock_tag); ret = -EBUSY; - goto out; + goto free_tag; } if (lock_type == CEPH_CLS_LOCK_SHARED) { rbd_warn(rbd_dev, "shared lock type detected"); ret = -EBUSY; - goto out; + goto free_tag; } if (strncmp((*lockers)[0].id.cookie, RBD_LOCK_COOKIE_PREFIX, @@ -3402,10 +3402,8 @@ static int get_lock_owner_info(struct rbd_device *rbd_dev, rbd_warn(rbd_dev, "locked by external mechanism, cookie %s", (*lockers)[0].id.cookie); ret = -EBUSY; - goto out; } - -out: + free_tag: kfree(lock_tag); return ret; }