From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757878AbcILTLm (ORCPT ); Mon, 12 Sep 2016 15:11:42 -0400 Received: from mout.web.de ([212.227.15.3]:57786 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752436AbcILTLj (ORCPT ); Mon, 12 Sep 2016 15:11:39 -0400 Subject: [PATCH 25/47] block-rbd: Fix jump targets in rbd_img_parent_read() 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: <813ced30-1914-b507-f5f8-ddc5d073c54a@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:11:27 +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:g9cRXWmsiLWaAcdo3VuDUzKxxY01JTFLnVms7PRr+QNUKBA55J0 OQD6+iFKBU0H4Wck46ILLUrtyTLB/ZpqJ/ZKr5O/E62o+mM/uOxmXJmA5iN2jYGMAwPFBXy qcmz5Dz9xS8Rq4MWYOV7m0bC5TISPv8eM7tNIf2T5xwQofbnliwWLBYXLgcCPpGz/53fx9c DZfzHQcxj1ObJMz0J4OQQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:lXhkzU7JuLw=:bABAFdmnVDxs8vzB18znk2 4V3TMTQMWq+ZHuGe+v2rlYLa+iqE3Ud39I/jl6PhI1QEzKGycCaEahLEGIY5vGmk0zskGuhcg 3Ku4Zdixq5c+3hnw0d61AutuyJ2XIsJ+mb3JRVWY4HwRE5OjrRXAYuNeFhuy6DI4AP2X+lvUy wg4psxtMdRnl5UA0Rqr1yNwLGGo6cNyGtBo0UZYiTPR9Pib3eMBXKhjdDvjVezVRsZ0fFSBge EgbCu/fDgTQdQjdPzl1PgjgkhRjRLOS0wXK3rCek/FFZO5S+4oWUL5IkVZsY/zy3c0vXSgY7B uOW1Rnv+Xg1B8ufGyhxObTycOLn6BgGE1rLOpXdbuKc24o35W4BuQGB/Qx4HE5ZVQdRFxy1r0 /B2tnQDbePYAC4FnK+fvqkixOLJVQqCzT7Sc4uSU6m2qfbbBloMxetQLgexi6BNjW9fmGJ4Uv 1NMoX39dNyGRDc/Sa/SknPxa/g6EQz4fCvnmTdtp7lui6EakO1WXfWe0lq8u/BQVCAn9KzxUl lc8zjlKhMCxpzYyxOKy34qkLOXuvPib1aWJrokI2S3P1ldXdV+kIXEqVodeDHqRTUkFp0Q2Ly pFHnpNFi9Hd7BnwYfHS7F/9RxfERvalfT8ZlzEdeLtNGqiPMSp5wXpgFbtXchpaLOjoqJb+WO CccQt53vxzo0/3hiAd6Vmg22sVbfuZOm08Z+lYHABIY92VhmuvNhXwOKPX3jyLjtYKtVxWsuX 7/ApBtCgsWON25FiMBOxWdKelpcfLAuYYlFSFFDm2PcqUIKkFft/HTPsdejFAiL7477bldSbb cUPtwfG 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:39:54 +0200 * Adjust jump targets according to the current Linux coding style convention. * Delete a duplicate check then at the end. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 09a0ed3..6777464 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3120,7 +3120,7 @@ static void rbd_img_parent_read(struct rbd_obj_request *obj_request) obj_request->length); result = -ENOMEM; if (!img_request) - goto out_err; + goto status_indication; if (obj_request->type == OBJ_REQUEST_BIO) result = rbd_img_request_fill(img_request, OBJ_REQUEST_BIO, @@ -3129,17 +3129,17 @@ static void rbd_img_parent_read(struct rbd_obj_request *obj_request) result = rbd_img_request_fill(img_request, OBJ_REQUEST_PAGES, obj_request->pages); if (result) - goto out_err; + goto put_request; img_request->callback = rbd_img_parent_read_callback; result = rbd_img_request_submit(img_request); if (result) - goto out_err; + goto put_request; return; -out_err: - if (img_request) - rbd_img_request_put(img_request); + put_request: + rbd_img_request_put(img_request); + status_indication: obj_request->result = result; obj_request->xferred = 0; obj_request_done_set(obj_request); -- 2.10.0