diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 18:10:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 18:10:15 -0800 |
| commit | 93939f4e5df30e6229a0b5257fdcaf3faf88471c (patch) | |
| tree | f30acb3e4a35ea96b342f3b1dd25700e7b531def | |
| parent | b1c0ec8966fa79891b796f58bf2bda1026ca5566 (diff) | |
| parent | b292cf9ce70d221c3f04ff62db5ab13d9a249ca8 (diff) | |
| download | op-kernel-dev-93939f4e5df30e6229a0b5257fdcaf3faf88471c.zip op-kernel-dev-93939f4e5df30e6229a0b5257fdcaf3faf88471c.tar.gz | |
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
| -rw-r--r-- | fs/nfsd/vfs.c | 5 | ||||
| -rw-r--r-- | net/sunrpc/svc_xprt.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 7c2e337..c194793 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -780,12 +780,9 @@ static inline int nfsd_dosync(struct file *filp, struct dentry *dp, int (*fsync) (struct file *, struct dentry *, int); int err; - err = filemap_fdatawrite(inode->i_mapping); + err = filemap_write_and_wait(inode->i_mapping); if (err == 0 && fop && (fsync = fop->fsync)) err = fsync(filp, dp, 0); - if (err == 0) - err = filemap_fdatawait(inode->i_mapping); - return err; } diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index 1c924ee..7d1f9e9 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) spin_unlock_bh(&pool->sp_lock); len = 0; - if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) { + if (test_bit(XPT_LISTENER, &xprt->xpt_flags) && + !test_bit(XPT_CLOSE, &xprt->xpt_flags)) { struct svc_xprt *newxpt; newxpt = xprt->xpt_ops->xpo_accept(xprt); if (newxpt) { |
