linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH v4 11/13] svcrdma: Remove close_out exit path
Date: Mon, 22 Feb 2016 15:42:17 -0500	[thread overview]
Message-ID: <20160222204217.3274.16437.stgit@sisley.1015granger.net> (raw)
In-Reply-To: <20160222203550.3274.82777.stgit@sisley.1015granger.net>

Clean up: close_out is reached only when ctxt == NULL and XPT_CLOSE
is already set.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Devesh Sharma <devesh.sharma@broadcom.com>
Tested-by: Devesh Sharma <devesh.sharma@broadcom.com>
---
 net/sunrpc/xprtrdma/svc_rdma_recvfrom.c |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

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;
 


  parent reply	other threads:[~2016-02-22 20:42 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-22 20:40 [PATCH v4 00/13] NFS/RDMA server patches for v4.6 Chuck Lever
2016-02-22 20:40 ` [PATCH v4 01/13] svcrdma: Find client-provided write and reply chunks once per reply Chuck Lever
2016-02-22 20:41 ` [PATCH v4 02/13] svcrdma: Do not write xdr_buf::tail in a Write chunk Chuck Lever
2016-02-22 20:41 ` [PATCH v4 03/13] svcrdma: Do not send Write chunk XDR pad with inline content Chuck Lever
2016-02-22 20:41 ` [PATCH v4 04/13] nfsd: Lower NFSv4.1 callback message size limit Chuck Lever
2016-02-22 20:41 ` [PATCH v4 05/13] svcrdma: Close connection when a send error occurs Chuck Lever
2016-02-22 20:41 ` [PATCH v4 06/13] svcrdma: svc_rdma_post_recv() should close connection on error Chuck Lever
2016-02-22 20:41 ` [PATCH v4 07/13] rpcrdma: Add RPCRDMA_HDRLEN_ERR Chuck Lever
2016-02-22 20:41 ` [PATCH v4 08/13] svcrdma: Make RDMA_ERROR messages work Chuck Lever
2016-02-22 20:42 ` [PATCH v4 09/13] svcrdma: Use correct XID in error replies Chuck Lever
2016-02-22 20:42 ` [PATCH v4 10/13] svcrdma: Hook up the logic to return ERR_CHUNK Chuck Lever
2016-02-22 20:42 ` Chuck Lever [this message]
2016-02-22 20:42 ` [PATCH v4 12/13] svcrdma: Use new CQ API for RPC-over-RDMA server receive CQs Chuck Lever
2016-02-22 20:42 ` [PATCH v4 13/13] svcrdma: Use new CQ API for RPC-over-RDMA server send CQs Chuck Lever

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160222204217.3274.16437.stgit@sisley.1015granger.net \
    --to=chuck.lever@oracle.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).