projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| a709ecc8 GKH |
1 | From f5822754ea006563e1bf0a1f43faaad49c0d8bb2 Mon Sep 17 00:00:00 2001 |
| 2 | From: J. Bruce Fields <bfields@citi.umich.edu> | |
| 3 | Date: Sun, 28 Feb 2010 16:32:51 -0500 | |
| 4 | Subject: Revert "sunrpc: fix peername failed on closed listener" | |
| 5 | ||
| 6 | From: J. Bruce Fields <bfields@citi.umich.edu> | |
| 7 | ||
| 8 | commit f5822754ea006563e1bf0a1f43faaad49c0d8bb2 upstream. | |
| 9 | ||
| 10 | This reverts commit b292cf9ce70d221c3f04ff62db5ab13d9a249ca8. The | |
| 11 | commit that it attempted to patch up, | |
| 12 | b0401d725334a94d57335790b8ac2404144748ee, was fundamentally wrong, and | |
| 13 | will also be reverted. | |
| 14 | ||
| 15 | Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> | |
| 16 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 17 | ||
| 18 | --- | |
| 19 | net/sunrpc/svc_xprt.c | 3 +-- | |
| 20 | 1 file changed, 1 insertion(+), 2 deletions(-) | |
| 21 | ||
| 22 | --- a/net/sunrpc/svc_xprt.c | |
| 23 | +++ b/net/sunrpc/svc_xprt.c | |
| 24 | @@ -711,8 +711,7 @@ int svc_recv(struct svc_rqst *rqstp, lon | |
| 25 | spin_unlock_bh(&pool->sp_lock); | |
| 26 | ||
| 27 | len = 0; | |
| 28 | - if (test_bit(XPT_LISTENER, &xprt->xpt_flags) && | |
| 29 | - !test_bit(XPT_CLOSE, &xprt->xpt_flags)) { | |
| 30 | + if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) { | |
| 31 | struct svc_xprt *newxpt; | |
| 32 | newxpt = xprt->xpt_ops->xpo_accept(xprt); | |
| 33 | if (newxpt) { |