diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 21:10:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 21:10:15 -0500 |
| commit | 93939f4e5df30e6229a0b5257fdcaf3faf88471c (patch) | |
| tree | f30acb3e4a35ea96b342f3b1dd25700e7b531def /net/sunrpc | |
| parent | b1c0ec8966fa79891b796f58bf2bda1026ca5566 (diff) | |
| parent | b292cf9ce70d221c3f04ff62db5ab13d9a249ca8 (diff) | |
Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.33' of git://linux-nfs.org/~bfields/linux:
sunrpc: fix peername failed on closed listener
nfsd: make sure data is on disk before calling ->fsync
nfsd: fix "insecure" export option
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/svc_xprt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index 1c924ee0a1ef..7d1f9e928f69 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c | |||
| @@ -699,7 +699,8 @@ int svc_recv(struct svc_rqst *rqstp, long timeout) | |||
| 699 | spin_unlock_bh(&pool->sp_lock); | 699 | spin_unlock_bh(&pool->sp_lock); |
| 700 | 700 | ||
| 701 | len = 0; | 701 | len = 0; |
| 702 | if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) { | 702 | if (test_bit(XPT_LISTENER, &xprt->xpt_flags) && |
| 703 | !test_bit(XPT_CLOSE, &xprt->xpt_flags)) { | ||
| 703 | struct svc_xprt *newxpt; | 704 | struct svc_xprt *newxpt; |
| 704 | newxpt = xprt->xpt_ops->xpo_accept(xprt); | 705 | newxpt = xprt->xpt_ops->xpo_accept(xprt); |
| 705 | if (newxpt) { | 706 | if (newxpt) { |