From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755938AbcILTYQ (ORCPT ); Mon, 12 Sep 2016 15:24:16 -0400 Received: from mout.web.de ([212.227.15.3]:58560 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752439AbcILTYN (ORCPT ); Mon, 12 Sep 2016 15:24:13 -0400 Subject: [PATCH 35/47] block-rbd: Rename jump labels in rbd_osd_req_create_copyup() 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:24:03 +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:oOA+mlHAwYo15o7K2+sSv05vsBom47xzJBY/zMETB/rK9Y7/KcX W6Es72hzEiJtzRWIpftQE9A62KR+lqs4c51Mvr9iDwDxBNu7PMRvM0scp8rVaj70jNmwr0C EvHVy0X06JhLn//TKYH4RUG6/LMU9cCcqn+Zsr9uq2zs5j46g2HMOwOBQmx6tuiP9oLSvXY eTCoWT5XJxXM0lurf26zA== X-UI-Out-Filterresults: notjunk:1;V01:K0:Xd0YMzn7rVo=:sQUw0jU47NYm6qBHxMNbpQ yDwJBKs5Q+4CGWFZ5wyi+lIaph2f/OCG6hq08bNuBrT/BL5kad4i9O6lAMRgHCGgClMo58n8p JDso4zO4G2X4AS+P700+1rmmroMKTm0+jbh13xDjkE0EtD/yAaY3dSE5kMebP0C+RXLBar/fp v1E8oraJnoHDtUU2Et1LqsY0X7Vwid8mUiwuDJmGM2Q0U91ymMNLd7aMtAWNtO/v6CBy1t6F+ hN6+IRRAa24tv6YeuEtrlCDRxNQZuTT+SOlRoYGhwPGuHUTq7zalXFI5zHw5TqGjOHnvuO1hJ I+a6v8jC/h+Rpy9TNl+b0Jkj9qpzf1BJ3nrUYE+Tj4RVvOF9u9XKJAwpDWQVL/fFAkRg0Zv7R bW2gBuyJOUCw5ZP8XwweBfbF7S+je2BmwfW26M+41ai6cLpfTnOom85ZVoTerO96b9shcVW7t nuzMJJfqwketO+SXjH3E14fbqpBqADYMDxYTvcCZQfWJeUlpPyjmOJPNLGpyXlxe7SpuZ6Vcv 6212RxWapUghOqZQheQTwWiSETUT+UCT/LVjtbS4H+zRXNcID6LHpm4EKVFf+PdERWeTZ9rjm m0YLkSZzS7nBBDcN8JdDdnUayM3MtRHT7aqNSpRO6EqPE8bCZPfmMWX42JwC29vKapNh9qqiF Ql/omIU4IJrHR+K06YhjBxJUXEaeLHsmMYaTG0jTpQqSbfjw8kPxH+lE5F/CWsm0WPWw5pcXQ 7BOjXkURXljEDLg5ovxs2m/w96UUrlkfP962q4CLSfiGmpnLu3pOPCuzpWLQqM7cMFp2zFFbZ aXMfKZ4 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:53:26 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index c349975..f779ff3 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2046,7 +2046,7 @@ rbd_osd_req_create_copyup(struct rbd_obj_request *obj_request) osd_req = ceph_osdc_alloc_request(osdc, snapc, num_osd_ops, false, GFP_NOIO); if (!osd_req) - goto fail; + goto put_request; osd_req->r_flags = CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK; osd_req->r_callback = rbd_osd_req_callback; @@ -2055,14 +2055,13 @@ rbd_osd_req_create_copyup(struct rbd_obj_request *obj_request) osd_req->r_base_oloc.pool = rbd_dev->layout.pool_id; if (ceph_oid_aprintf(&osd_req->r_base_oid, GFP_NOIO, "%s", obj_request->object_name)) - goto fail; + goto put_request; if (ceph_osdc_alloc_messages(osd_req, GFP_NOIO)) - goto fail; + goto put_request; return osd_req; - -fail: + put_request: ceph_osdc_put_request(osd_req); return NULL; } -- 2.10.0