diff options
| author | James Morris <jmorris@namei.org> | 2009-06-09 01:27:53 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-09 01:27:53 +0200 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /fs/nfsd | |
| parent | integrity: ima audit dentry_open failure (diff) | |
| parent | async: Fix lack of boot-time console due to insufficient synchronization (diff) | |
| download | linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.tar.xz linux-0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f.zip | |
Merge branch 'master' into next
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/vfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 81ff0f4de4b7..bd584bcf1d9f 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1018,6 +1018,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); } @@ -1063,10 +1064,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; |