From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754137AbbL0Mkg (ORCPT ); Sun, 27 Dec 2015 07:40:36 -0500 Received: from mout.web.de ([212.227.15.14]:61356 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753833AbbL0Mke (ORCPT ); Sun, 27 Dec 2015 07:40:34 -0500 Subject: [PATCH 1/2] InfiniBand-iSER: One jump label less in iser_reg_sig_mr() To: linux-rdma@vger.kernel.org, target-devel@vger.kernel.org, Doug Ledford , Hal Rosenstock , Or Gerlitz , Roi Dayan , Sagi Grimberg , Sean Hefty References: <566ABCD9.1060404@users.sourceforge.net> <567FDB4E.2040000@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <567FDC2D.2090706@users.sourceforge.net> Date: Sun, 27 Dec 2015 13:40:13 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <567FDB4E.2040000@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:bNr1rxZ1zmY8mEjoIqhcYByFxmmowA5Q5fGDAjza2nKZdN2p/ht 64daGzgtHZbFAe/FxWiVCl71v7/Cscggbd2h8NGCZz48wVua75mY4nWaDaHfeh7mxYThINf WYeyjljpbOIJzIpm36tHg5xeE6bWS045UnL9ZkPIy/R2AFDGe6Tz7qF2mpwKUG37PnNfbNI rB/WUw6Lkg2K7lloC8lEQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:azik1pFkHgY=:UZBNhyJq+2TE9EI67+ZyXt bJCwOZTGH0PWI0MNZmw2CvR2Sqjk7b3tfk6tZT/0/rDpzPzBhxFdqoMuYkeamJ5E7HLasWwoh H++uraD8uFihsF7Wqrgjz+nBoyoMh163xziK2bzo4OZ4OkfJ/TYwuYCEiwWrePMKF8htPZjEh 0gHWRGhqEGuyFHGvUrZLHTVuzPi1938FUfdMdKZfRFXHfM06t5AaZg1A+qxCZCvvZhj8iJ43U rtpK2ejV+j6BXnO+GdWncKgEoOk2YH6VgiSX1/Q38FB3/yLOCmPIcn0z4i9WcuWpl1gWo2CRl Tv5NiPapkZghcn9J9ODVsurhagiaFcL/EgUMIYZMLmScNpA13QcIer/aWbvCDaeRRrJYPiODn 2Id97EoYZRDEJFiQKp0BdBbUKWqqxQ86Ko2vEIl0M05kkL+oL3J5XZxsPXXUFbYVU+7vS9K6U AoYXfq6Ged+nfgmbeIje/AreO1bWMiKnqp04WvjQtXYVE8D0klPPpt3bo4HG4rAtwxKEVxDsJ DFHsswa5ceqcKbNPa8QGtrsANwYrP6BD+XYL+tcIlWz2TsVliZLHlHwUEnz8ZndZrYoohP1gl S4TZ7+rJc6MfO1jyS6WOp43gqCejFTTJ4BPJ7sEIMg0fi9UsdFo0GhvhDytugVSa1r3ukuLUo bDxSAncrFI0yYYLs+r7E3A4bIw5SZTFDa+LEuy7VKdnafqThBpTHQB+v/kD4A705tihiPLtV6 h6AvMZXXE9Mu/ThdWNw8/SFwc0obyn6XMCptmkQa2rfSSfcrN3uKgFpEKQefcPBE6S+YSYpNb n8/UMNg Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 27 Dec 2015 11:41:42 +0100 This issue was detected by using the Coccinelle software. 1. Let us return directly if a call of the iser_set_sig_attrs() function failed. 2. Delete the jump label "err" then. 3. Return zero as a constant at the end. Signed-off-by: Markus Elfring --- drivers/infiniband/ulp/iser/iser_memory.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c index ea765fb..14e08b3 100644 --- a/drivers/infiniband/ulp/iser/iser_memory.c +++ b/drivers/infiniband/ulp/iser/iser_memory.c @@ -443,7 +443,7 @@ iser_reg_sig_mr(struct iscsi_iser_task *iser_task, memset(sig_attrs, 0, sizeof(*sig_attrs)); ret = iser_set_sig_attrs(iser_task->sc, sig_attrs); if (ret) - goto err; + return ret; iser_set_prot_checks(iser_task->sc, &sig_attrs->check_mask); @@ -475,8 +475,7 @@ iser_reg_sig_mr(struct iscsi_iser_task *iser_task, iser_dbg("lkey=0x%x rkey=0x%x addr=0x%llx length=%u\n", sig_reg->sge.lkey, sig_reg->rkey, sig_reg->sge.addr, sig_reg->sge.length); -err: - return ret; + return 0; } static int iser_fast_reg_mr(struct iscsi_iser_task *iser_task, -- 2.6.3