From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757083AbcILTFl (ORCPT ); Mon, 12 Sep 2016 15:05:41 -0400 Received: from mout.web.de ([212.227.15.14]:62014 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752340AbcILTFf (ORCPT ); Mon, 12 Sep 2016 15:05:35 -0400 Subject: [PATCH 19/47] block-rbd: Rename a jump label in rbd_reregister_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: <83afc929-81ff-db63-4f08-a9c72eb8dde6@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:05:21 +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:FJ5sz22W26UkopjeDV7a7yqLhUggIlgQV9sLs/7LGKPy5rspDQL F5ACxIMJkt0nD1f5QqSdRLlnyCm41YMzXYl7sSqlk7CRaC/8FVLeRd0XBi80abMfMnJXlWu QF3jdowKfqTs5xdMROfbW95PXaP62FafhWaq0YmnkRVX3kda8VyHYg/L6HxkL63K3zo1i5Y /xZJ3n2mxKckWCAZPzgkQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:jvsfLYgFiYw=:mt8Ai/jj/LzYCDvhv3CO/L EyrUravCf/EANrpSfN8+TjcX5ss3OvxF0OrUwG+BgRSVvXRp7HeIiCOVxOFOjxu5QHVvPW2XP MLbbWyztkcAf1GoCrhITeNiDP4JMXwO06+cKx5Z+sa+lSrVB2jcUD2keH+fLJLvH076QBRCPg SBx3NUkxgsYlaKF8fhNLjQAUh7lfVLT3fabDL3OsuRKmvGqAScAQm8thKd/fpK/3LpIA6jdsu TLUsjN5qeBk9owKrKhgWwohnbi3zbl6S+PaMB1F5/UO1X15pdh/V2gouJy36MmIQWTwp1VUHS LzkWOBqIdTvCOy4RvqNg6iZAflpvGskVkhE/G/+ztQfjlxZPWbjE+psYY07PXq/nihNmbMcQ8 6anJxXkr3U0yfg/UQ3QGXHVvzOBjGL4TgjQ4W547eh34/a1CqEqWNt9mUnDdBGGn6sCmM0Pak gMDXMXEjjKzc+XAU4g2g6Jwqb6Gr67DORcIVrN5e6DkN+tKxWMOO0KkAPdYDCuHtkfIjz8GH6 dB86hsVG3AvB1za/azo0lDwJ4np/wC1pDv8V/XE6GfdtfGDJi92XAcpZy856jL0lJz/Xb8jzG v0TTNvUjd7JmD8waiZbI2SHKdLRbUpCKetRWy92ZOPHND5FX1LneQ4YyFgENy4cJKI2SZUgJg xNW84Ja/uYj37RS3sPUkoP2zc0bpqoBDpS8TJiWll6CaLEcVKI9lXRR2d7MJQMY2eEAXnAa1f LpqE00KUwbslKPXfMdP/GxxKLYYVXVTd/8rZ9y1n7wAMsFMgNSaKgLdT0bOGttFltFESeNf8g eKlj7kA 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:31:04 +0200 Adjust a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 2b5f76e..97dbc1a 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3950,7 +3950,7 @@ static void rbd_reregister_watch(struct work_struct *work) mutex_lock(&rbd_dev->watch_mutex); if (rbd_dev->watch_state != RBD_WATCH_STATE_ERROR) - goto fail_unlock; + goto unlock; ret = __rbd_register_watch(rbd_dev); if (ret) { @@ -3959,7 +3959,7 @@ static void rbd_reregister_watch(struct work_struct *work) queue_delayed_work(rbd_dev->task_wq, &rbd_dev->watch_dwork, RBD_RETRY_DELAY); - goto fail_unlock; + goto unlock; } rbd_dev->watch_state = RBD_WATCH_STATE_REGISTERED; @@ -3980,8 +3980,7 @@ static void rbd_reregister_watch(struct work_struct *work) up_write(&rbd_dev->lock_rwsem); wake_requests(rbd_dev, true); return; - -fail_unlock: + unlock: mutex_unlock(&rbd_dev->watch_mutex); up_write(&rbd_dev->lock_rwsem); } -- 2.10.0