From patchwork Mon Sep 10 15:09:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 10594383 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B2A04109C for ; Mon, 10 Sep 2018 15:10:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2BDB2871B for ; Mon, 10 Sep 2018 15:10:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97B252904A; Mon, 10 Sep 2018 15:10:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FB772871B for ; Mon, 10 Sep 2018 15:10:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728413AbeIJUEe (ORCPT ); Mon, 10 Sep 2018 16:04:34 -0400 Received: from mail-it0-f41.google.com ([209.85.214.41]:40446 "EHLO mail-it0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727940AbeIJUEe (ORCPT ); Mon, 10 Sep 2018 16:04:34 -0400 Received: by mail-it0-f41.google.com with SMTP id h23-v6so29086724ita.5; Mon, 10 Sep 2018 08:10:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=VsJsRdCui+ofSV+6STxal7J3T4NlBzRnzKjVPpc9shY=; b=JyMNXnux+RsAac18V/cgda6lEAZ+uF2Ks7ndgeAGhYYgsL/tV5q+oY7uBnoNcCKDnz UoB2tdnSKkAPpOfcbQjIJ5Y3hjc/3f7INCRaoNAtTveTDUMJFntqf/gEhBMelTcZYhQU fklxpa0n3mTL80p8mPFJnWkV1oqAZCRcog7UmqoutJO9Y7NBHn78tBuG2p0UXQSTvOpi z1qdz/3SjC69OVQ2XSOdIsB1dofk8VGJJ/wOmOo7EN7Eh52Qc7xwQaCW75PhQD5fknHo HsOfGinXjrgpBCTN1sYwwaLMMK6NldqqgSlVUhddRx+EvRRVsrPoJErQE836tzclzGn7 TUMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=VsJsRdCui+ofSV+6STxal7J3T4NlBzRnzKjVPpc9shY=; b=Atq6DLJ9SumCktJ5RAKDS5GNp4/jSMSPl/mALZyH/EXd2fpXovCdziNOIIIqfHtjSp zDpboDmpjNcUDS796QFzelw6UUaFVtwOif+fupWltolyXagK0Rxjl89FBFm7t2PaL0Fi k9o+0lZv68gCnCYphjOcmOCb1l9kycqtkzy2FFuI9NGE1O+6XYP5mQk+jh6lxo/OKJxx P4uGvYdszGf+TOLUhFNVvDI/EqcrS/Bj/rdsNXGzK1h0q9Bk5uOwajuy7VUgiZMYcjTn 77irXSj3WMt+8Y5nVsJLBmX5OpYSGtf5T5ueHlWDc4WJz3tSLSFcuVJNvFoIpJ/YcgYU q1dA== X-Gm-Message-State: APzg51B5NRoucBssOUzJ/e4Aj2sNRvQG5gYsRt58T8FuS1L/Uc71Z4Dj AW4Dmz/oN72XSZA/hePl19vOzYJU X-Google-Smtp-Source: ANB0VdZJ1Eysk+kmevslII8NOAINglVrXBVQE+k0jstHBuV4xAZGOEOv0xuEg+QOAqaD61NAnqdvBw== X-Received: by 2002:a24:b302:: with SMTP id e2-v6mr19069831itf.132.1536592201015; Mon, 10 Sep 2018 08:10:01 -0700 (PDT) Received: from gateway.1015granger.net (c-68-61-232-219.hsd1.mi.comcast.net. [68.61.232.219]) by smtp.gmail.com with ESMTPSA id m47-v6sm6910117iti.1.2018.09.10.08.10.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:10:00 -0700 (PDT) Received: from manet.1015granger.net (manet.1015granger.net [192.168.1.51]) by gateway.1015granger.net (8.14.7/8.14.7) with ESMTP id w8AF9xNM015183; Mon, 10 Sep 2018 15:09:59 GMT Subject: [PATCH v1 12/22] xprtrdma: Eliminate "connstate" variable from rpcrdma_conn_upcall() From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Mon, 10 Sep 2018 11:09:59 -0400 Message-ID: <20180910150959.10564.83078.stgit@manet.1015granger.net> In-Reply-To: <20180910150040.10564.97487.stgit@manet.1015granger.net> References: <20180910150040.10564.97487.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Clean up. Since commit 173b8f49b3af ("xprtrdma: Demote "connect" log messages") there has been no need to initialize connstat to zero. In fact, in this code path there's now no reason not to set rep_connected directly. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/verbs.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index f2c8c3c..422d3db 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -234,7 +234,6 @@ struct rpcrdma_ia *ia = &r_xprt->rx_ia; struct rpcrdma_ep *ep = &r_xprt->rx_ep; struct rpc_xprt *xprt = &r_xprt->rx_xprt; - int connstate = 0; might_sleep(); @@ -270,28 +269,27 @@ return 1; case RDMA_CM_EVENT_ESTABLISHED: ++xprt->connect_cookie; - connstate = 1; + ep->rep_connected = 1; rpcrdma_update_connect_private(r_xprt, &event->param.conn); goto connected; case RDMA_CM_EVENT_CONNECT_ERROR: - connstate = -ENOTCONN; + ep->rep_connected = -ENOTCONN; goto connected; case RDMA_CM_EVENT_UNREACHABLE: - connstate = -ENETUNREACH; + ep->rep_connected = -ENETUNREACH; goto connected; case RDMA_CM_EVENT_REJECTED: dprintk("rpcrdma: connection to %s:%s rejected: %s\n", rpcrdma_addrstr(r_xprt), rpcrdma_portstr(r_xprt), rdma_reject_msg(id, event->status)); - connstate = -ECONNREFUSED; + ep->rep_connected = -ECONNREFUSED; if (event->status == IB_CM_REJ_STALE_CONN) - connstate = -EAGAIN; + ep->rep_connected = -EAGAIN; goto connected; case RDMA_CM_EVENT_DISCONNECTED: ++xprt->connect_cookie; - connstate = -ECONNABORTED; + ep->rep_connected = -ECONNABORTED; connected: - ep->rep_connected = connstate; rpcrdma_conn_func(ep); wake_up_all(&ep->rep_connect_wait); /*FALLTHROUGH*/