| From 09a80f2aef06b7c86143f5c14efd3485e0d2c139 Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trondmy@gmail.com> |
| Date: Tue, 17 Dec 2019 12:33:33 -0500 |
| Subject: nfsd: Return the correct number of bytes written to the file |
| |
| From: Trond Myklebust <trondmy@gmail.com> |
| |
| commit 09a80f2aef06b7c86143f5c14efd3485e0d2c139 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/nfsd/vfs.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/fs/nfsd/vfs.c |
| +++ b/fs/nfsd/vfs.c |
| @@ -1016,6 +1016,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s |
| 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); |
| |