From patchwork Thu May 6 23:36:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Metzmacher X-Patchwork-Id: 12243649 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E828C433ED for ; Thu, 6 May 2021 23:38:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8111061164 for ; Thu, 6 May 2021 23:38:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232840AbhEFXjn (ORCPT ); Thu, 6 May 2021 19:39:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232846AbhEFXjm (ORCPT ); Thu, 6 May 2021 19:39:42 -0400 Received: from hr2.samba.org (hr2.samba.org [IPv6:2a01:4f8:192:486::2:0]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 824E0C061574 for ; Thu, 6 May 2021 16:38:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=samba.org; s=42; h=Message-Id:Date:Cc:To:From; bh=ysiqFt6wjmuvvJ3BMaZhbil9Yy6iEDpm6PVV3IzjKEU=; b=Vzs94vp+2fYixqb5Xz0QFiBsNq 12kpt5xs+SB44DvwL24V6+Hs8e0jm1BG8ZViWRoYanvlXRqkZa9fgDDaTOBaBFyj8KFFDFMlAx37w /OYwpwzaok2PRiTepw8ClojHVh9R5pSv7f1FAL0HeN4NNQfqec5Ie+MZC3I6c1v0SNyH1Vy3ylX9d dQTK/clq3Ncv+/as6aHhP+HiP/yv5ivmaGbjt3lUVzReKNG0QCXXppYIRVFDowHdeqKbyfNgJB+dt PlHli590Rjbpt8oeUO0OG6HVYaV20xs9MLjJ9K4XCY/JoZ5wBXfay3Gwtn13HR6rSDDzHanY1cUZA 2cKFvgfmlvmRWTs6vZDrEmFdMkpWN4tU9sSB4uhA9ccHDXmHsf8iRNwPv+Mhgxg40cB3Rl+Vu+FBS q8z+g9ohTDGRoVrUmdzEanFUe+FGylY7Vcw5ULonkh9NsysVQ6N5KsfDcru0vn9J9KAH0o21aIh1k tp0zrGSARMvfmXTFqf5VyPBE; Received: from [127.0.0.2] (localhost [127.0.0.1]) by hr2.samba.org with esmtpsa (TLS1.3:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim) id 1lenZp-0004Lg-Kc; Thu, 06 May 2021 23:38:41 +0000 From: Stefan Metzmacher To: Bernard Metzler Cc: linux-rdma@vger.kernel.org, Stefan Metzmacher Subject: [PATCH 16/31] rdma/siw: use error and out logic at the end of siw_connect() Date: Fri, 7 May 2021 01:36:22 +0200 Message-Id: <3c43552c9b61a4d2352ae3680bfcacc25a9cc9b4.1620343860.git.metze@samba.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org This will make the following changes easier. Fixes: 6c52fdc244b5 ("rdma/siw: connection management") Signed-off-by: Stefan Metzmacher Cc: Bernard Metzler Cc: linux-rdma@vger.kernel.org Reviewed-by: Bernard Metzler --- drivers/infiniband/sw/siw/siw_cm.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c index 41d3436985a6..ec6d5c26fe22 100644 --- a/drivers/infiniband/sw/siw/siw_cm.c +++ b/drivers/infiniband/sw/siw/siw_cm.c @@ -1539,14 +1539,19 @@ int siw_connect(struct iw_cm_id *id, struct iw_cm_conn_param *params) cep->mpa.pdata = NULL; } - if (rv >= 0) { - rv = siw_cm_queue_work(cep, SIW_CM_WORK_MPATIMEOUT); - if (!rv) { - siw_dbg_cep(cep, "[QP %u]: exit\n", qp_id(qp)); - siw_cep_set_free(cep); - return 0; - } + if (rv < 0) { + goto error; + } + + rv = siw_cm_queue_work(cep, SIW_CM_WORK_MPATIMEOUT); + if (rv != 0) { + goto error; } + + siw_dbg_cep(cep, "[QP %u]: exit\n", qp_id(qp)); + siw_cep_set_free(cep); + return 0; + error: siw_dbg(id->device, "failed: %d\n", rv);