xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
James Morris
2009-06-09 09:27:53 +10:00
parent 04288f4203 3af968e066
commit 0b4ec6e4e0
353 changed files with 12683 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfsd/vfs.c
View File

@@ -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;