diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-04-18 17:07:44 -0400 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-13 12:33:21 +0200 |
| commit | f31f1cc4a7c216f738b66a16dba771e9f4276ddb (patch) | |
| tree | d82687d34b7009ef08f71650f0485054d9c02ca6 | |
| parent | 3d156398528a18eaf681a882e3834abbe5d5f538 (diff) | |
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>
Conflicts:
fs/f2fs/data.c
| -rw-r--r-- | fs/f2fs/data.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 6fae71f8e..37935bae5 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; @@ -1709,10 +1712,16 @@ static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb, if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode)) return 0; + trace_f2fs_direct_IO_enter(inode, offset, count, rw); + err = blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs, get_data_block_dio); - if (err < 0 && (rw & WRITE)) - f2fs_write_failed(mapping, offset + count); + if (err < 0 && (rw & 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, rw, err); |