--- net/sunrpc/svc_xprt.c

+++ net/sunrpc/svc_xprt.c

@@ -711,8 +711,10 @@ int svc_recv(struct svc_rqst *rqstp, lon

spin_unlock_bh(&pool->sp_lock);

len = 0;

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

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

+ 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)) {

struct svc_xprt *newxpt;

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

if (newxpt) {

@@ -738,7 +740,7 @@ int svc_recv(struct svc_rqst *rqstp, lon

svc_xprt_received(newxpt);

}

svc_xprt_received(xprt);

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

+ } else {

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

rqstp, pool->sp_id, xprt,

atomic_read(&xprt->xpt_ref.refcount));

@@ -751,11 +753,6 @@ int svc_recv(struct svc_rqst *rqstp, lon

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;

@@ -901,11 +898,8 @@ void svc_delete_xprt(struct svc_xprt *xp

if (test_bit(XPT_TEMP, &xprt->xpt_flags))

serv->sv_tmpcnt--;

- for (dr = svc_deferred_dequeue(xprt); dr;

- dr = svc_deferred_dequeue(xprt)) {

- svc_xprt_put(xprt);

+ while ((dr = svc_deferred_dequeue(xprt)) != NULL)

kfree(dr);

- }

svc_xprt_put(xprt);

spin_unlock_bh(&serv->sv_lock);