Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0401d72 authored by Wei Yongjun's avatar Wei Yongjun Committed by J. Bruce Fields
Browse files

sunrpc: move the close processing after do recvfrom method 



sunrpc: "Move close processing to a single place"
(d7979ae4) moved the
close processing before the recvfrom method. This may
cause the close processing never to execute. So this
patch moves it to the right place.

Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent aaf84eb9

net/sunrpc/svc_xprt.c

+7 −5
Original line number Diff line number Diff line
@@ -710,10 +710,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout) 
	spin_unlock_bh(&pool->sp_lock);



	len = 0;

	if (test_bit(XPT_CLOSE, &xprt->xpt_flags)) {

		dprintk("svc_recv: found XPT_CLOSE\n");

		svc_delete_xprt(xprt);

	} else if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) {

	if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) {

		struct svc_xprt *newxpt;

		newxpt = xprt->xpt_ops->xpo_accept(xprt);

		if (newxpt) {
@@ -739,7 +736,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout) 
			svc_xprt_received(newxpt);

		}

		svc_xprt_received(xprt);

	} else {

	} else if (!test_bit(XPT_CLOSE, &xprt->xpt_flags)) {

		dprintk("svc: server %p, pool %u, transport %p, inuse=%d\n",

			rqstp, pool->sp_id, xprt,

			atomic_read(&xprt->xpt_ref.refcount));
@@ -752,6 +749,11 @@ int svc_recv(struct svc_rqst *rqstp, long timeout) 
		dprintk("svc: got len=%d\n", len);

	}



	if (test_bit(XPT_CLOSE, &xprt->xpt_flags)) {

		dprintk("svc_recv: found XPT_CLOSE\n");

		svc_delete_xprt(xprt);

	}



	/* No data, incomplete (TCP) read, or accept() */

	if (len == 0 || len == -EAGAIN) {

		rqstp->rq_res.len = 0;