From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757944AbcILTHb (ORCPT ); Mon, 12 Sep 2016 15:07:31 -0400 Received: from mout.web.de ([212.227.15.14]:59798 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757882AbcILTH2 (ORCPT ); Mon, 12 Sep 2016 15:07:28 -0400 Subject: [PATCH 21/47] block-rbd: Rename jump labels in rbd_try_lock() 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:07:16 +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:uGTgr03mfygY4IF41zSEqxal+lzmGElr2e6NXyYOMFAHyviI8cm Z2ctiQ26OVXrUsOZEpE5FPRFWiUglj/+ZRSzLtPNM4UfPZOKuS0yPc84rIoReBZyUNYtqCt quO5o948iOZ6kCsTguY3aUeElkLvR0Anpqx2QB0R2Q7r7/M8YejyGf8wFwrFUYHEVIwGFhX 4xhU2J9rG5vz5LlcHpsGQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:1S/eKmakwj8=:PdLMd5GuYMQHsyv5b8zqYR vPWQ8Pj4p7YCrRdvj0AkeRrGJo0yqEncTwf49ZUxnJWMPV1I5YiIVcNh6jEZWIerdBfI20R3g pcfkQTZdmrEbrp0aSUyNOq5oJvSmwr3pmOdQHvLrdUiPsEseOUW2jaa2bAdqI0HgA/xR2cGPi bgJwxDKkSh8nrIJ7A2G+cY/KRD9U23sobyjTi4/ssDCqpqONPcAFaw53w2pOsRolhyFm5LQ/q uSUkdUYKaeQn5vbVNNcAxfIynY8nHYE+Nc4db4Wv5md89ol3vyiRA3w3JAiGtG4TqVhmO/T36 KeuvTzl/7IrEG53oZJofZfalmgRoQP1GjLz9BBQcEXW4jjEmsk1QG7lx3aeetPNtDjs+jp3Px vOA5rfUw/QFamf+Ufv6iLPXaiv9cxFmJChN9BXkzKoSz6j+/xn6iCB7MwrP0sykjhICgPDjSn xJLLi2naIKdo7x+mSmGUqnqQgDoFUWwl+MwMBlDyWrjyH//06zkqQXm1xJLz3xxA7aC8ZSwV2 UoIl5POzpp6gOQOM1orCQP16/m0uKFqQ7oWGe8cUtyuIy2DQeZ4jLtX4gehiAPy43kxqyFf+h KlBlxWnPO79sfc0ncNc6SWVYftZWX5P3GOJY7mYPSBoADLiptF9yOxzwCA/Kyw/HDj4gxZxqw WfSCZe9aqYdGeZFSDbEgc1jiPD3gs/e9WIcXXBjV3tARoLFYETGGm8i7DOmOxj8LPjN6XOUpX dDC0+AjoCwj676Z5atD+tFTDr3i2TFRpt9iB3Op+IYaEHnHNuiF8loLHIiNV1JnA3Xw0Q7J8F TB4kHjO 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:35:08 +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, 5 insertions(+), 7 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index b0b5a3b..7802351 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3478,7 +3478,7 @@ static int rbd_try_lock(struct rbd_device *rbd_dev) if (ret) { if (ret > 0) ret = 0; /* have to request lock */ - goto out; + goto free_lockers; } rbd_warn(rbd_dev, "%s%llu seems dead, breaking lock", @@ -3489,7 +3489,7 @@ static int rbd_try_lock(struct rbd_device *rbd_dev) if (ret) { rbd_warn(rbd_dev, "blacklist of %s%llu failed: %d", ENTITY_NAME(lockers[0].id.name), ret); - goto out; + goto free_lockers; } ret = ceph_cls_break_lock(&client->osdc, &rbd_dev->header_oid, @@ -3497,13 +3497,11 @@ static int rbd_try_lock(struct rbd_device *rbd_dev) lockers[0].id.cookie, &lockers[0].id.name); if (ret && ret != -ENOENT) - goto out; - -again: + goto free_lockers; + again: ceph_free_lockers(lockers, num_lockers); } - -out: + free_lockers: ceph_free_lockers(lockers, num_lockers); return ret; } -- 2.10.0