| From f5822754ea006563e1bf0a1f43faaad49c0d8bb2 Mon Sep 17 00:00:00 2001 |
| From: J. Bruce Fields <bfields@citi.umich.edu> |
| Date: Sun, 28 Feb 2010 16:32:51 -0500 |
| Subject: Revert "sunrpc: fix peername failed on closed listener" |
| |
| From: J. Bruce Fields <bfields@citi.umich.edu> |
| |
| commit f5822754ea006563e1bf0a1f43faaad49c0d8bb2 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| net/sunrpc/svc_xprt.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/net/sunrpc/svc_xprt.c |
| +++ b/net/sunrpc/svc_xprt.c |
| @@ -711,8 +711,7 @@ 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_LISTENER, &xprt->xpt_flags)) { |
| struct svc_xprt *newxpt; |
| newxpt = xprt->xpt_ops->xpo_accept(xprt); |
| if (newxpt) { |
