diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /fs/nfsd | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 1 | ||||
| -rw-r--r-- | fs/nfsd/vfs.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index fd7a5b227..150acc6d9 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -18,7 +18,6 @@ #include <linux/fcntl.h> #include <linux/net.h> #include <linux/in.h> -#include <linux/version.h> #include <linux/unistd.h> #include <linux/malloc.h> #include <linux/proc_fs.h> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 63294ae29..14cb7d50f 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -585,7 +585,7 @@ nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset, * nice and simple solution (IMHO), and it seems to * work:-) */ - if (EX_WGATHER(exp) && (inode->i_writecount > 1 + if (EX_WGATHER(exp) && (atomic_read(&inode->i_writecount) > 1 || (last_ino == inode->i_ino && last_dev == inode->i_dev))) { #if 0 interruptible_sleep_on_timeout(&inode->i_wait, 10 * HZ / 1000); |