From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756128AbcILTQr (ORCPT ); Mon, 12 Sep 2016 15:16:47 -0400 Received: from mout.web.de ([212.227.15.4]:60396 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751311AbcILTQp (ORCPT ); Mon, 12 Sep 2016 15:16:45 -0400 Subject: [PATCH 30/47] block-rbd: Refactor a jump target in rbd_img_obj_exists_callback() 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: <0c3708aa-f7b2-0b0f-234d-dd63f44e7072@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:16:34 +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:wG1aJw5CPE4urk8FsHV2kpiXr5sKlXXRBI6HAb+HxCszJP7LI7x oTWn5092zKIrv/gMsBY2vn4N4bpd8ysI+8YgzbowVEzfl+9D3SpAtxp3r0Q3wtq160GAavJ MzSQlyhmKSudGn8Jq3X0vo4DEGplDt46JPDUSQ2NivIlmGzQ1Ae/d0boVjZpVLLj3NuYTIA Nd+C2cg3pLUrmI8sfEvxQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:8S+8kXPzhUw=:0bAKcj09ooC3f1wxU0c9fD vj7+U0vsq0PkzUFqzr6FxMyCBtBVJkHHh1O3A/7btCTauEpM2NBgykQwscEcKWkX+lIKA+URK fb/z50k6oOc0NKazPkHqbdQJBVOkZ9zlvbkqT/K2dp4qgVhjYgRqOVV8l+FFvVQa9J7Dfysb+ jFrBtSUnjkMlhe8eAEpJv5ju41iXFPXJGPPK2nJST63ZgWcYdN2IIDk0A6iVhXyQJd+w1TSez sK6Z+K/5t4YVRboABaPkBKErLLFDjJa3ai8rloyEANp47eHoW5yn3vevTdMJ5LiV5NDvaO0aA 1yawsA7kL+dyAKQZ8Bi+LktoohOxBt/XH5uf+JTAQvnF8LP5kz8bDSoNTvhtRGoER50y4GVVS saJdZBTID1mfNvFztSNO5XMcZxY5cPrd2SmFRtaRVhwRBcbiA5Qp2jAE+YtuunR5+vqU//H/d YVvEjwpUwRSFw+BkaDiqTOHht6MGVhSbs3jw8B3Gixlkx4T+vfnWtyTYA6BEuoh0k0DSvrc3L XQ+JDfrFzuVhKU3GTrUHf8GjaZQPQUOnvY/tuhVPLJzMe+LFBo0NrxR09sHdy+9PsUOBUuzBL /pSqV8SWC2WeM6IrggASEUZB4TgaiBowFxhdN6X54rsMIQg/Hyo+xqOnokNzi+ScFuOwA+l3A 0cIuiKSox3Pu/yFnRqAwPBIF8oVtqU/Lsrt9+NZ4It2OgdUuE4Wb3N//9TB5eaA0dUpzayLg6 buWwAqV1cSyeomcjFIFA0u2+iN9V0xZ992BdNl/LFlEQFrgFkTksmWQLMZt0A0zB9Ukno7gpE OUjLK4c5oWhu3ibjS2k6bMus8hVqhfexOzzBzNXfQJfZwfpdy0wFuPbaxNW1oKLkvwzt88una +C0uDixa594OtntF3kQx0CJXz4JHcC5J7jxcnstRoEWalRmdwbPQ1TtNuMf03OKPNoMSMDjdN MRc8YdLsScw9IF3yptcZTmnF1kqmUlW2WjN+3yJfrOX4/C+4XDyw+ 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:46:43 +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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index f3f2919..7d5f7b9 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2879,7 +2879,7 @@ static void rbd_img_obj_exists_callback(struct rbd_obj_request *obj_request) obj_request_existence_set(orig_request, false); } else if (result) { orig_request->result = result; - goto out; + goto complete_request; } /* @@ -2887,8 +2887,8 @@ static void rbd_img_obj_exists_callback(struct rbd_obj_request *obj_request) * whether the target object exists. */ orig_request->result = rbd_img_obj_request_submit(orig_request); -out: if (orig_request->result) + complete_request: rbd_obj_request_complete(orig_request); } -- 2.10.0