From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757408AbcILTGX (ORCPT ); Mon, 12 Sep 2016 15:06:23 -0400 Received: from mout.web.de ([212.227.15.3]:61970 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756755AbcILTGU (ORCPT ); Mon, 12 Sep 2016 15:06:20 -0400 Subject: [PATCH 20/47] block-rbd: Rename a jump label in rbd_register_watch() 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: <76429d28-548c-63dd-fee7-ca5585b88856@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:06:10 +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:NBqVTRfJMLOPC4x3GdoIVTP7mR32e8dWCWGeGrQYmPKYVn0ndQq ozC4e4bY9wMOWAYm3XEFYukbgrhbtE8+X9wAY7Uob4f+cw6XV8dwD4BnZ3cQSjBaWx05YwR jtHiDUGLC62R7Y0vlD8yXPFKJO01ndTaFDio16JKitzV0QtwR1PETJI6pITvyHtedNKAv0I YbebyRldDSzACPYHdXQuw== X-UI-Out-Filterresults: notjunk:1;V01:K0:m3jdSG00uEo=:VsEs+ZHXGERfEFhci6NSRS BNgpB59vRbB0W8VF+E068QyErXLhW32nkLhjGTe4G8E2ODCt7tmwjyfNHZ4f3KtaSFi38ScnL N9yANU261e/YKNjV0uAfS+2bVElubpXMDIlK6MwYLy6AziXdP7LtrpYMmTwlFOPdsSMTVvRCB yUCKO6Yu0e/BkeS8+zICQtxd4jueewIVqJbiENJmdoJKQiSmUgBZTyDAU9vNGHWPBc0uMMVjV Gknr9rRbQck/c8+OccwWHFCIT2tjbuGI33X6/rQ9GHDwi8jJc1VsvY7ciCCT9AuLXciKekrCd ed+s+Q2R1zqOBwNYdxsc6EZklXCsHudBHboiq7hCK4+ML02QnekMswd8dtkUGLoOwwp8DUFgy 5Wt5RD2LTwyIkSP16LFqrZqqzG99d6UyVG4bUWeL8Jm+1FA6XkeuZq9GyNT0l9XYWgeScL066 VjudhCxAvw8ElCtm5kOdlBMI7zxhF2zqcE4mMuam+mypaZF6t3EfYDBn2zG7xFhqQFKHr26kh cOsBBYTio01hjNh3Jj2DJQiM1ZviFr8i3ui0MWaTDUHzdPl/v92jDS5u5bYxkGtsjQw0LL2bi kdir7HmGnRQANBmS7wgOM3XLoznvc7GPqmjc/ImCoSFpeXLa8OwD+8ZYnkEyy2AG3LGPXGqK9 X8ztmQdngi0U9XyBXBiHhGHt5dsnaMvsJNpyWDjtLSDu+MyvGely/us9pnLTZVNJ57R3Cf6iU POh5hGFW7DxkcQYN7hP6YQrZ9H2uDTxctSnf9dPCGRJwtJSs1W7VA8US6qSU6C8UnwGWFRBDq IO+ofxx 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:33:00 +0200 Adjust a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 97dbc1a..b0b5a3b 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3900,12 +3900,11 @@ static int rbd_register_watch(struct rbd_device *rbd_dev) rbd_assert(rbd_dev->watch_state == RBD_WATCH_STATE_UNREGISTERED); ret = __rbd_register_watch(rbd_dev); if (ret) - goto out; + goto unlock; rbd_dev->watch_state = RBD_WATCH_STATE_REGISTERED; rbd_dev->watch_cookie = rbd_dev->watch_handle->linger_id; - -out: + unlock: mutex_unlock(&rbd_dev->watch_mutex); return ret; } -- 2.10.0