|
|
@@ -2439,10 +2439,14 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb,
|
|
|
/* buffered aio wouldn't have proper lock coverage today */
|
|
|
BUG_ON(ret == -EIOCBQUEUED && !(file->f_flags & O_DIRECT));
|
|
|
|
|
|
+ if (unlikely(written <= 0))
|
|
|
+ goto no_sync;
|
|
|
+
|
|
|
if (((file->f_flags & O_DSYNC) && !direct_io) || IS_SYNC(inode) ||
|
|
|
((file->f_flags & O_DIRECT) && !direct_io)) {
|
|
|
- ret = filemap_fdatawrite_range(file->f_mapping, *ppos,
|
|
|
- *ppos + count - 1);
|
|
|
+ ret = filemap_fdatawrite_range(file->f_mapping,
|
|
|
+ iocb->ki_pos - written,
|
|
|
+ iocb->ki_pos - 1);
|
|
|
if (ret < 0)
|
|
|
written = ret;
|
|
|
|
|
|
@@ -2453,10 +2457,12 @@ static ssize_t ocfs2_file_write_iter(struct kiocb *iocb,
|
|
|
}
|
|
|
|
|
|
if (!ret)
|
|
|
- ret = filemap_fdatawait_range(file->f_mapping, *ppos,
|
|
|
- *ppos + count - 1);
|
|
|
+ ret = filemap_fdatawait_range(file->f_mapping,
|
|
|
+ iocb->ki_pos - written,
|
|
|
+ iocb->ki_pos - 1);
|
|
|
}
|
|
|
|
|
|
+no_sync:
|
|
|
/*
|
|
|
* deep in g_f_a_w_n()->ocfs2_direct_IO we pass in a ocfs2_dio_end_io
|
|
|
* function pointer which is called when o_direct io completes so that
|