ocfs2_file_write_iter: keep return value and current position update …

…in sync Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
mariux64 · Apr 8, 2015 · 9ce5a23 · 9ce5a23
1 parent cf1b5ea
commit 9ce5a23
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
@@ -2408,7 +2408,6 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb,
 			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 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb,
 		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,