From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757850AbcILTLA (ORCPT ); Mon, 12 Sep 2016 15:11:00 -0400 Received: from mout.web.de ([212.227.15.14]:49245 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751724AbcILTKw (ORCPT ); Mon, 12 Sep 2016 15:10:52 -0400 Subject: [PATCH 24/47] block-rbd: Rename jump labels in rbd_request_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:10:34 +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:x9/1karcd4OdVapOU3pn15luU+bsh5qBfLm+01cOC+UfKTnSzdh 31/YImQK8ecQOIjiSXsPGYqL/q2+IOhySY0dkIS+ruE1UkBocQNohik7n4DfwqddLImt1+Z MdE96McV3zgzrhD/KgGe1xDvgzFfKcJIypQTwldjYU9mXusv/wgMSyyHAI67NcxUb5u0Tvv /B4AHhhfet8zlh2OA2tuQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:+zEl6G9t3Q8=:EOJhh7XrYYHGeg6trkYnlx VoEq4b6EM+JFxDma9CSgwI1egRyIFSGEWyywgK9uKukvRwlLbxpFXcimAea0F0yuk5VaM5Oqm NEpgh+LMbUwDW+S/9lU3JcPd144R7BsIuJqszBJ2wFU+mj86RxV7UpV6csD/PKUQ4EyY185eK 2valTh4ILc3uGI7vIgKCIQh7M40dZpJNWNxgaurN3cb3jGFdavbShDdtNj7vz7C1uc+bJtuS4 PJGXmzMbN/ah/9YA7iUCb6RM0vR3KO/36fFuoJszsaCrBcH0GMaUIcrWVF6UmDJc4a3IhdCm6 YJzm6vgLaeefxeI5sTJLK2nX9teDFQ3UtiDWk0YCdYMhZch409DA6waSIhgCSsOIucWw14hms qrJgGm+eRljIsfYbzBnM9oVNeD0pJQmS8aD/pxTDwTLH4COCLWO1H/eKNKqOVhT4nOs/JwDf0 c9kR9hFJr5r8k+EaBpqN6EObLtr9RYPjGLnX2K6D6E+AGPJR3iTaQgaVz3oSBVsgYNvSVaerE SQPFULxUgKUfuFBUr/HxoY64WKtE51tkaXJEZtXuPpwiZEWou9SPWry64sg9LU52A+2eLTCUS 51mvSRyS2f+qiwWhIMZh2ufRd3VBhZ303XQI33vrljKY9dWNQQI86SP9kzFSKk3r8SWI7HVUy Ys+XyDundBkvuvYM3Bydn5z5kqdnGGNG4PYpXJXnXMClhRdQRbr8JPYwTj4vpkWoPI+tUCI+s /sYHPGMfyjdVxmkSeeJ3oK/dXWsDu0n2y4m1aWJNTOxODN3W0leJrEgW1BXv9FwDVUrFKbeV9 o7p2t6I 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:38:52 +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 e175d21..09a0ed3 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3297,7 +3297,7 @@ static int rbd_request_lock(struct rbd_device *rbd_dev) &reply_pages, &reply_len); if (ret && ret != -ETIMEDOUT) { rbd_warn(rbd_dev, "failed to request lock: %d", ret); - goto out; + goto release_page_vector; } if (reply_len > 0 && reply_len <= PAGE_SIZE) { @@ -3321,7 +3321,7 @@ static int rbd_request_lock(struct rbd_device *rbd_dev) rbd_warn(rbd_dev, "duplicate lock owners detected"); ret = -EIO; - goto out; + goto release_page_vector; } lock_owner_responded = true; @@ -3342,14 +3342,12 @@ static int rbd_request_lock(struct rbd_device *rbd_dev) rbd_warn(rbd_dev, "no lock owners detected"); ret = -ETIMEDOUT; } - -out: + release_page_vector: ceph_release_page_vector(reply_pages, calc_pages_for(0, reply_len)); return ret; - -e_inval: + e_inval: ret = -EINVAL; - goto out; + goto release_page_vector; } static void wake_requests(struct rbd_device *rbd_dev, bool wake_all) -- 2.10.0