From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758035AbcILT2c (ORCPT ); Mon, 12 Sep 2016 15:28:32 -0400 Received: from mout.web.de ([212.227.15.3]:65373 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753971AbcILT22 (ORCPT ); Mon, 12 Sep 2016 15:28:28 -0400 Subject: [PATCH 39/47] block-rbd: Rename a jump label in rbd_ioctl_set_ro() 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: <754b2b00-bf3b-7ed1-2605-c7b3f2269bf7@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:28:18 +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:HquHxdgeNTVzGEtAd4fN8Te7/1kK2/REbDqYlM8xcduHuNOsBHs BiG8kcgkPlc7uulU9vSytbyUZwTlwJ10U8ItqcpXNgZ/2dBmXNfdEnk7T1klYMdGMDmJcjv skg9M9VELooXcNGPGEEm02ozi+Ci9SaYJAbvE/NK38w1vF9JDlNuV8LGVQWOxEWwwUFkLTT beWRg/ptDqH9UYoCmzMHQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:0uLFTxjIZeE=:79F5DdK6k0L4TsQMVy+gi3 8q8Qp/rz0ZD6UW+MoNimRnWCCIdOiF+YiUgGQGDqJio6K9EL4mMHrPomURr5tg5azbUvJ/BuL UZGelzvwxaOR08H6wOtIFLZt7Qz93qaUjV43EVTesiyRQ45nD8HaP1aJuN46+wcgckIhTLRwJ xsopikDM92WJLdgsaHBay/DwsmrbzpBuYN9EZLkDIIczwsCZHPRfejxaSsuMG8sjG3S0Ri+8d WqOm8pDMmxhz6qZM/xGbazYPMb85Bx6yTHBM2J3ZtWHfDQqO8c36/MClyLbTk6qTFZYJwQFbu 95uLHwS51pGVtNXiYmfU09WJIj9qLOAqj70yQV2VW7bWu2/Wk01p3uTBTFUPcxXdLsOGEhK51 +vBddCBJjsS5u5AmOJRz7h/pGJRiuiWyxxUSCVF5rcDG9S8JddApkJ0tgzjMN1MxJfbgxjpCf 6jyRCE2gHmckTQB+AiCjh6OHMDlP5j6dvDIhZxRElEyFAdOC1I34jEwDClDNSy/hMugqXYxLX CGQu2hAdFolgNJDP0bZCLR2BnYNgTeBY8dkR5r6rgBzxB1ck8wLP+anqZmTW8Lqybb6nQy4Rv Gplik5a+juoVat5dRhxb/9qU50ijBPxKZkACE3U83Icn/pPcobTaJZ+ST4k0IiNXT6wY73LqL 2aufCLaJFqCG9rxoL74cui21XyPRUQyis6BQ7QGI4EEEmPvslzMoTaevwNdTDjhPtOC6HTqAI 0Y3WAg23bYoNj9bQtEbI8Y5wtufdtIVI5193YVpYv9q1AbMVeHpI3MPP6uHV8BfH2H2SBY8pj xFAF433 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:58:22 +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 9902a7f..e01df3c 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -654,15 +654,14 @@ static int rbd_ioctl_set_ro(struct rbd_device *rbd_dev, unsigned long arg) /* prevent others open this device */ if (rbd_dev->open_count > 1) { ret = -EBUSY; - goto out; + goto unlock; } if (rbd_dev->mapping.read_only != ro) { rbd_dev->mapping.read_only = ro; ro_changed = true; } - -out: + unlock: spin_unlock_irq(&rbd_dev->lock); /* set_disk_ro() may sleep, so call it after releasing rbd_dev->lock */ if (ret == 0 && ro_changed) -- 2.10.0