From: Trond Myklebust <trondmy@gmail.com>
Date: Tue, 17 Dec 2019 17:33:33 +0000 (-0500)
Subject: nfsd: Return the correct number of bytes written to the file
X-Git-Tag: v5.6-rc1~28^2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09a80f2aef06b7c86143f5c14efd3485e0d2c139;p=thirdparty%2Flinux.git

nfsd: Return the correct number of bytes written to the file

We must allow for the fact that iov_iter_write() could have returned
a short write (e.g. if there was an ENOSPC issue).

Fixes: d890be159a71 "nfsd: Add I/O trace points in the NFSv4 write path"
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index c0dc491537a69..f0bca0e87d0c4 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -975,6 +975,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
 	host_err = vfs_iter_write(file, &iter, &pos, flags);
 	if (host_err < 0)
 		goto out_nfserr;
+	*cnt = host_err;
 	nfsdstats.io_write += *cnt;
 	fsnotify_modify(file);