summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-04-08 15:45:02 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-08 16:59:12 -0400
commit9ce5a232b8a941be9e74c055535d81508207a570 (patch)
tree472b0dd45ae46039ed0e795cf2d9910a68fd81fe /fs
parentcf1b5ea1c5cd26a003b01d4798266a4bdf0ffe64 (diff)
downloadlinux-stable-9ce5a232b8a941be9e74c055535d81508207a570.tar.gz
linux-stable-9ce5a232b8a941be9e74c055535d81508207a570.tar.bz2
linux-stable-9ce5a232b8a941be9e74c055535d81508207a570.zip
ocfs2_file_write_iter: keep return value and current position update in sync
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 099972490f39..a39067f4dd55 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2408,7 +2408,6 @@ relock:
goto out_dio;
}
- iocb->ki_pos = *ppos + written_buffered;
/* We need to ensure that the page cache pages are written to
* disk and invalidated to preserve the expected O_DIRECT
* semantics.
@@ -2417,6 +2416,7 @@ relock:
ret = filemap_write_and_wait_range(file->f_mapping, *ppos,
endbyte);
if (ret == 0) {
+ iocb->ki_pos = *ppos + written_buffered;
written += written_buffered;
invalidate_mapping_pages(mapping,
*ppos >> PAGE_CACHE_SHIFT,