summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authortarangg@amazon.com <tarangg@amazon.com>2017-09-07 16:29:23 +0300
committerTrond Myklebust <trond.myklebust@primarydata.com>2017-09-07 18:07:13 +0300
commite973b1a5999e57da677ab50da5f5479fdc0f0c31 (patch)
treee6c6e1e64fd7149e6ba99f45ca01ee0e80e4847c /fs
parent58a69893a9bf6833a79dae801da78e1d4f46f0a2 (diff)
downloadlinux-e973b1a5999e57da677ab50da5f5479fdc0f0c31.tar.xz
NFS: Sync the correct byte range during synchronous writes
Since commit 18290650b1c8 ("NFS: Move buffered I/O locking into nfs_file_write()") nfs_file_write() has not flushed the correct byte range during synchronous writes. generic_write_sync() expects that iocb->ki_pos points to the right edge of the range rather than the left edge. To replicate the problem, open a file with O_DSYNC, have the client write at increasing offsets, and then print the successful offsets. Block port 2049 partway through that sequence, and observe that the client application indicates successful writes in advance of what the server received. Fixes: 18290650b1c8 ("NFS: Move buffered I/O locking into nfs_file_write()") Signed-off-by: Jacob Strauss <jsstraus@amazon.com> Signed-off-by: Tarang Gupta <tarangg@amazon.com> Tested-by: Tarang Gupta <tarangg@amazon.com> Cc: stable@vger.kernel.org # v4.8+ Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 1d71472d239d..a385d1c3f146 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -631,11 +631,11 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
if (result <= 0)
goto out;
- result = generic_write_sync(iocb, result);
- if (result < 0)
- goto out;
written = result;
iocb->ki_pos += written;
+ result = generic_write_sync(iocb, written);
+ if (result < 0)
+ goto out;
/* Return error values */
if (nfs_need_check_write(file, inode)) {