From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 8 Apr 2015 19:45:02 +0000 (-0400)
Subject: ocfs2_file_write_iter: keep return value and current position update in sync
X-Git-Tag: omap-for-v4.1/fixes-rc1~205^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=9ce5a232b8a941be9e74c055535d81508207a570;hp=cf1b5ea1c5cd26a003b01d4798266a4bdf0ffe64

ocfs2_file_write_iter: keep return value and current position update in sync

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

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,