Commit 9ce5a232 authored by Al Viro's avatar Al Viro

ocfs2_file_write_iter: keep return value and current position update in sync

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent cf1b5ea1
...@@ -2408,7 +2408,6 @@ relock: ...@@ -2408,7 +2408,6 @@ relock:
goto out_dio; goto out_dio;
} }
iocb->ki_pos = *ppos + written_buffered;
/* We need to ensure that the page cache pages are written to /* We need to ensure that the page cache pages are written to
* disk and invalidated to preserve the expected O_DIRECT * disk and invalidated to preserve the expected O_DIRECT
* semantics. * semantics.
...@@ -2417,6 +2416,7 @@ relock: ...@@ -2417,6 +2416,7 @@ relock:
ret = filemap_write_and_wait_range(file->f_mapping, *ppos, ret = filemap_write_and_wait_range(file->f_mapping, *ppos,
endbyte); endbyte);
if (ret == 0) { if (ret == 0) {
iocb->ki_pos = *ppos + written_buffered;
written += written_buffered; written += written_buffered;
invalidate_mapping_pages(mapping, invalidate_mapping_pages(mapping,
*ppos >> PAGE_CACHE_SHIFT, *ppos >> PAGE_CACHE_SHIFT,
......
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