summaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2016-04-18 17:07:44 -0400
committerJaegeuk Kim <jaegeuk@kernel.org>2016-04-26 14:25:05 -0700
commit6bfc49197eba070b799ab4ca8755d3a9fd1700da (patch)
treede08963c815844f492c03713071c2933e00f137f /fs/f2fs
parent608514deba38c8611ad330d6a3c8e2b9a1f68e4b (diff)
downloadop-kernel-dev-6bfc49197eba070b799ab4ca8755d3a9fd1700da.zip
op-kernel-dev-6bfc49197eba070b799ab4ca8755d3a9fd1700da.tar.gz
f2fs: issue cache flush on direct IO
Under direct IO path with O_(D)SYNC, it needs to set proper APPEND or UPDATE flags, so taht f2fs_sync_file can make its data safe. Acked-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/data.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index e54489b..38ce5d6 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -673,6 +673,9 @@ next_block:
err = reserve_new_block(&dn);
} else {
err = __allocate_data_block(&dn);
+ if (!err)
+ set_inode_flag(F2FS_I(inode),
+ FI_APPEND_WRITE);
}
if (err)
goto sync_out;
@@ -1685,8 +1688,12 @@ static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter,
trace_f2fs_direct_IO_enter(inode, offset, count, iov_iter_rw(iter));
err = blockdev_direct_IO(iocb, inode, iter, offset, get_data_block_dio);
- if (err < 0 && iov_iter_rw(iter) == WRITE)
- f2fs_write_failed(mapping, offset + count);
+ if (iov_iter_rw(iter) == WRITE) {
+ if (err > 0)
+ set_inode_flag(F2FS_I(inode), FI_UPDATE_WRITE);
+ else if (err < 0)
+ f2fs_write_failed(mapping, offset + count);
+ }
trace_f2fs_direct_IO_exit(inode, offset, count, iov_iter_rw(iter), err);
OpenPOWER on IntegriCloud