From patchwork Wed Feb 3 15:52:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever III X-Patchwork-Id: 8204341 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CF7C0BEEE5 for ; Wed, 3 Feb 2016 15:52:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 09C64200DF for ; Wed, 3 Feb 2016 15:52:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2666F2025B for ; Wed, 3 Feb 2016 15:52:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757282AbcBCPwb (ORCPT ); Wed, 3 Feb 2016 10:52:31 -0500 Received: from mail-io0-f193.google.com ([209.85.223.193]:33784 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755919AbcBCPw3 (ORCPT ); Wed, 3 Feb 2016 10:52:29 -0500 Received: by mail-io0-f193.google.com with SMTP id f81so2741614iof.0; Wed, 03 Feb 2016 07:52:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=l52iIDKd9sc8TUkUvpWn3XQnfKf9gzFin21NZRLYgE8=; b=wzIf1gcddzenBGA+z5/K/qaqgvbznOwlm1f9SOcULlPnNMjiUa9hP+S4h73GQ1sOzr rx49IrZLY4b3BwtHXirMsa2KPf5MCUBB2eyZ7HKjUC1HytI+fDcEZL6Uk/MNzuR5B59y mB7VjsO6L8uHjPUSVE74EGxu/pUvWlfXwsRvug4Kb44IQDCsqve9lbSzX7Ne/H4+Zlrr lF6WkOadUOshBPj4dc6muWyFTRw88xld9PWVS13Id3sOlG14MFyRqVMYnNavh0nCLxiH +CKzZTf7eQZxrBLZW1fUM+fjFYqWun3UuD9BQR/MXxdxcl7rccm7h22oVpdcyd7/2XqT e7gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version:content-type :content-transfer-encoding; bh=l52iIDKd9sc8TUkUvpWn3XQnfKf9gzFin21NZRLYgE8=; b=j2SPBmbW3FxCJAGmsvy5b6B5x9YPaEPh0gcj8upLkd/HRzUnBSoAUj5nSyX/cKqdjh c0bk+2NiOxLgcu9rg2li292VJRmDUiD1O697YlnGfacgv9DiK5yi/1b2jdaKyOlToM8+ simdQKks2gYKu8m/wixlLL+E8bl5iBMvpvVfrAqYmRl1lJedLR1y4NvG5oc9sa74uitV +DzIq2QoCaQfE5y2MSo/hHBXrxPbDLxZfHhtAnHYZW5cLNCOVRqKlL6d1KkjcW4huPgA DujHsudGOl4gkqB+e15DmsPv0mP7D31xc5Yf7I2c9m8sd8tb8OYVeDA15g9Y1zlfHNxE NI7A== X-Gm-Message-State: AG10YOTyv86fzN544J5SCMVrcJGdTyPlmBtqxGtTE3FtrTGn5lMFGhI67cXEIDvhhSQDBA== X-Received: by 10.107.10.105 with SMTP id u102mr3850071ioi.85.1454514748724; Wed, 03 Feb 2016 07:52:28 -0800 (PST) Received: from klimt.1015granger.net (c-68-46-169-226.hsd1.mi.comcast.net. [68.46.169.226]) by smtp.gmail.com with ESMTPSA id f14sm3165323ioi.20.2016.02.03.07.52.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Feb 2016 07:52:28 -0800 (PST) Subject: [PATCH v1 08/10] svcrdma: Remove close_out exit path From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Wed, 03 Feb 2016 10:52:27 -0500 Message-ID: <20160203155227.13868.21062.stgit@klimt.1015granger.net> In-Reply-To: <20160203154411.13868.48268.stgit@klimt.1015granger.net> References: <20160203154411.13868.48268.stgit@klimt.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-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Clean up: close_out is reached only when ctxt == NULL and XPT_CLOSE is already set. Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index f8b840b..d3718e9 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c @@ -641,8 +641,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) * transport list */ if (test_bit(XPT_CLOSE, &xprt->xpt_flags)) - goto close_out; - + goto defer; goto out; } dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n", @@ -700,15 +699,6 @@ out_err: svc_rdma_put_context(ctxt, 0); return 0; - close_out: - if (ctxt) - svc_rdma_put_context(ctxt, 1); - dprintk("svcrdma: transport %p is closing\n", xprt); - /* - * Set the close bit and enqueue it. svc_recv will see the - * close bit and call svc_xprt_delete - */ - set_bit(XPT_CLOSE, &xprt->xpt_flags); defer: return 0;