From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757422AbcILTOS (ORCPT ); Mon, 12 Sep 2016 15:14:18 -0400 Received: from mout.web.de ([212.227.15.14]:55881 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751724AbcILTOP (ORCPT ); Mon, 12 Sep 2016 15:14:15 -0400 Subject: [PATCH 28/47] block-rbd: Refactor a jump target in rbd_img_obj_exists_submit() 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:14:05 +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:JCSp7/PZ0JhR5rMTId6hcN3G4gg+GGO1w9Zi/vUV0jlIyViBKuG DCf6h12uLxwJW3IKZ3Yzs3gr9cSu+T5MUYSjFGUx9qrJUjjUyiIc7KQup+96RuTPSNyTmlx 569hbrW4XGET5zlP33N9iZ6PXUJosPKF0MhYM6oz1ljn2zyJ/xxaj7p12HfXNl/jowuSrkT rvbKSQM2/zzJQSjPSgOfQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:x445wbab7BY=:aphGvFMMLN/GTyfHJZ1xDY A2Cu18pyS4qHOxObQDiOWEkxfNnIxx3UbKhusLhMaHzRGSCuJlgcLgq7tv7J8IR5+Csroxj5F r4m9Xr53L3D8sCf5gTXps7RiVKSE9PrkP+vnZ1oPMqTEXT7ssfkv+iXh9oQjxup3Sh3tYv+li rqVtNgmb4BSbU6DJLl+DdFomzUmb3NMfrAFkkncK49HV7PDwbNxobNT5OF7UqH0Sjxrh4zQ8G 8Enzrvi1BbqDLm4Ff0G/Y7bGR+gJz5ZdYS0rlgRe8CTfYtlgvVQflJAaPpwx/rBFu1uAFa16r zO1CKEnsXM64XtAPiaSIpRujnhEqrSnZ3APGqvooSetca0+ZY8YiO23Z1DBOwrfFWSj44oGQT +/6COBXs+sniJb4PFv3+KvPFLCxlHOAZdnMBQPiIhRTFe5fb8ACKDIw0gdDd5BDm5UgFgnNot LCm/0nF5yezLnfFPXjQJKdTcR0DCic/NZ+IPhtjydaGDI0kl624PO+17xmS053Ce7I8iqF+e3 Zc2DmOBZoKBoxObzYPAW8bOEUAxozm1Lv3EN8oqJr2DWayTkFW+lr9yE4fJBUlBiHnRYUTNle oEpaChZw1WF+X9z5aKTxLqiWvdw2YhG5lgzOecj7W+89FMBwEERQ5HhXNC2A+eovL7aVLeKnD 1+QatFfBz96qrkSFi3X7ykFkX3Tk4ziAo7ryJ52dbqBI4h1gMIcMyHoTvrZByW4yEwuFYrIxD wo7q3AVvr7mgPwvhrtD2RWrHHkT98dxy2hZetXzSzheJYPGy98c69GqSKDwypyl+8FT2if+ZV IjwaXZD 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:44:30 +0200 Adjust a jump target so that a duplicate check can then be avoided at the end. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 17bdc21..66801ec 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2920,7 +2920,7 @@ static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request) stat_request = rbd_obj_request_create(obj_request->object_name, 0, 0, OBJ_REQUEST_PAGES); if (!stat_request) - goto out; + goto put_request; rbd_obj_request_get(obj_request); stat_request->obj_request = obj_request; @@ -2932,7 +2932,7 @@ static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request) stat_request->osd_req = rbd_osd_req_create(rbd_dev, OBJ_OP_READ, 1, stat_request); if (!stat_request->osd_req) - goto out; + goto put_request; stat_request->callback = rbd_img_obj_exists_callback; osd_req_op_init(stat_request->osd_req, 0, CEPH_OSD_OP_STAT, 0); @@ -2942,8 +2942,8 @@ static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request) osdc = &rbd_dev->rbd_client->client->osdc; ret = rbd_obj_request_submit(osdc, stat_request); -out: if (ret) + put_request: rbd_obj_request_put(obj_request); return ret; -- 2.10.0