summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-29 08:49:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-29 08:49:09 -0700
commitc8bce3d3bdedc7d187fa222a3b36d149bd940d0e (patch)
tree47f335f6faaca36eed1dceb64dc0366ef68ec875 /fs
parent5f789cd8bae9b6315b7bf93e24ec1ac85f5a13b9 (diff)
parent98779be861a05c4cb75bed916df72ec0cba8b53d (diff)
downloadlinux-stable-c8bce3d3bdedc7d187fa222a3b36d149bd940d0e.tar.gz
linux-stable-c8bce3d3bdedc7d187fa222a3b36d149bd940d0e.tar.bz2
linux-stable-c8bce3d3bdedc7d187fa222a3b36d149bd940d0e.zip
Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.30' of git://linux-nfs.org/~bfields/linux: svcrdma: dma unmap the correct length for the RPCRDMA header page. nfsd: Revert "svcrpc: take advantage of tcp autotuning" nfsd: fix hung up of nfs client while sync write data to nfs server
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/vfs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 6c68ffd6b4bb..b660435978d2 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1015,6 +1015,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
set_fs(oldfs);
if (host_err >= 0) {
+ *cnt = host_err;
nfsdstats.io_write += host_err;
fsnotify_modify(file->f_path.dentry);
}
@@ -1060,10 +1061,9 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
}
dprintk("nfsd: write complete host_err=%d\n", host_err);
- if (host_err >= 0) {
+ if (host_err >= 0)
err = 0;
- *cnt = host_err;
- } else
+ else
err = nfserrno(host_err);
out:
return err;