diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-02-28 16:32:51 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-02-28 16:39:15 -0500 |
commit | f5822754ea006563e1bf0a1f43faaad49c0d8bb2 (patch) | |
tree | cf5903542cf7b9e9c564c2db722a1d8eb8f1789d /net/sunrpc/svc_xprt.c | |
parent | ab1b18f70a007ea6caeb007d269abb75b131a410 (diff) |
Revert "sunrpc: fix peername failed on closed listener"
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>
Diffstat (limited to 'net/sunrpc/svc_xprt.c')
-rw-r--r-- | net/sunrpc/svc_xprt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index 09838300dac4..818c4c365b28 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c | |||
@@ -706,8 +706,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout) | |||
706 | spin_unlock_bh(&pool->sp_lock); | 706 | spin_unlock_bh(&pool->sp_lock); |
707 | 707 | ||
708 | len = 0; | 708 | len = 0; |
709 | if (test_bit(XPT_LISTENER, &xprt->xpt_flags) && | 709 | if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) { |
710 | !test_bit(XPT_CLOSE, &xprt->xpt_flags)) { | ||
711 | struct svc_xprt *newxpt; | 710 | struct svc_xprt *newxpt; |
712 | newxpt = xprt->xpt_ops->xpo_accept(xprt); | 711 | newxpt = xprt->xpt_ops->xpo_accept(xprt); |
713 | if (newxpt) { | 712 | if (newxpt) { |