From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756519AbcILTZT (ORCPT ); Mon, 12 Sep 2016 15:25:19 -0400 Received: from mout.web.de ([212.227.17.12]:59288 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244AbcILTZQ (ORCPT ); Mon, 12 Sep 2016 15:25:16 -0400 Subject: [PATCH 36/47] block-rbd: Rename jump labels in rbd_osd_req_create() 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: <1897bc71-74c4-934d-f8ca-2f095a71b4fd@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:25: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:k3Ce+hylNvzj9jC7rHh40w5Ze/Bsp3HxbKQAzx+TQfkKt2wnlRb rbSm+RdW5QAQ9U4FXbE/n2rfzGqvFFFahbfrLvxRRaM6gcB405aUEO6SmzxxMorC24G+f6q A6ihDhgT03UMaADEpeEKoqGcp0jO7Bg3cuqDKBIxdwaHOMj4Vh36QX4OVE4cApRUAemEHSS IXGIxqZ2xPcjcXGApSwyw== X-UI-Out-Filterresults: notjunk:1;V01:K0:5y6ZXd2GhKk=:XzqNEAmVpo23yX7T01jNCr t7nWQa2GZONHB+a3Y3Unyp0TlY292simsXly4uhSuggqqoWjce77tldVl3sdHweDcYT5oElzS 2yOc42g6p6JYJyseLc5js+JPYgEAW79CKGv6PfgGJ1Gioik7XLTxukZP1lRMeIyHFJa4FNatr 7qUDUMT8AGJfuP1rKE47f5NmSdCRexQ8NMrsvHYdIFW/SnekekFtCTZ9c1iJsIq5mksceCDXL A8BhqrvHkHqNQIo85MI8c0wIJKqBrkVx60S3fsFm74dk03aG+lXETci5p+HSBSalWPvtYMNzL ufoJ21ZUdDV8ZriQ/Tgae5E8jhE8qwxA+7U1dlUeoNVfYmIAu7k0CwZVMqZFPnxNIF/ITtg1R d5jtR6TiUcRNq4tvnbQNhxlNWdLgpqI6xvwQNOWAdBv5Jlu8FhWbGJHdhE8lE2kPZ7Cud6SsX IwfkGd8U4lUaPQ6U+TVam8seahVDkhyZZSMsAl2jB2xaKaDvGqPoVLxXrvvK8FgTnDXQG0rES /WnrjFNgtp0tpF+viU5ysUdFpthkRwHrolzFmfy5Ni4y3PDCQp0PW8TLca5H71/vXmzAmA+w6 Utzi5HasZrbXVLvfopFN61IxnrZx6gHLXOMXw8aCmizkRc6qgkxLXfSTSH6fIUiRNkliKvcVp 6zyLguVjaHqX1z31b+8kNJ1SkS0GBIhwpxu3by4kEyuYsmgYDN6pLQK+IO0D+6Fs1PCaYhzzP 3ybIT6F9TtyHJ244zVL/OsnwMHM5f8iQJKRBIzlcnDaKkYAuN7a5874eK4/8VoZNji7eOVquW dFujFrV 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:54:39 +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 f779ff3..8e9d30f7 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1988,7 +1988,7 @@ static struct ceph_osd_request *rbd_osd_req_create( osd_req = ceph_osdc_alloc_request(osdc, snapc, num_ops, false, GFP_NOIO); if (!osd_req) - goto fail; + goto put_request; if (op_type == OBJ_OP_WRITE || op_type == OBJ_OP_DISCARD) osd_req->r_flags = CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK; @@ -2001,14 +2001,13 @@ static struct ceph_osd_request *rbd_osd_req_create( 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