Commit 3307d5f5 authored by tarangg@amazon.com's avatar tarangg@amazon.com Committed by Greg Kroah-Hartman

NFS: Sync the correct byte range during synchronous writes

commit e973b1a5 upstream.

Since commit 18290650 ("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: 18290650 ("NFS: Move buffered I/O locking into nfs_file_write()")
Signed-off-by: default avatarJacob Strauss <jsstraus@amazon.com>
Signed-off-by: default avatarTarang Gupta <tarangg@amazon.com>
Tested-by: default avatarTarang Gupta <tarangg@amazon.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f50e3a1
...@@ -629,11 +629,11 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) ...@@ -629,11 +629,11 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from)
if (result <= 0) if (result <= 0)
goto out; goto out;
result = generic_write_sync(iocb, result);
if (result < 0)
goto out;
written = result; written = result;
iocb->ki_pos += written; iocb->ki_pos += written;
result = generic_write_sync(iocb, written);
if (result < 0)
goto out;
/* Return error values */ /* Return error values */
if (nfs_need_check_write(file, inode)) { if (nfs_need_check_write(file, inode)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment