Revert "sunrpc: fix peername failed on closed listener"
authorJ. Bruce Fields <bfields@citi.umich.edu>
Sun, 28 Feb 2010 21:32:51 +0000 (16:32 -0500)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Sun, 28 Feb 2010 21:39:15 +0000 (16:39 -0500)
This reverts commit b292cf9ce70d221c3f04ff62db5ab13d9a249ca8.  The
commit that it attempted to patch up,
b0401d725334a94d57335790b8ac2404144748ee, was fundamentally wrong, and
will also be reverted.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
net/sunrpc/svc_xprt.c

index 09838300dac4b12059229d0dc9c37941d5969c2e..818c4c365b285ab423e014b00721798554d3396a 100644 (file)
@@ -706,8 +706,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
        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_LISTENER, &xprt->xpt_flags)) {
                struct svc_xprt *newxpt;
                newxpt = xprt->xpt_ops->xpo_accept(xprt);
                if (newxpt) {