diff options
author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-07-24 22:11:43 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-07-30 17:13:23 -0400 |
commit | ea1aa12ca237149227ef68af50c9a1acf027b625 (patch) | |
tree | 12ac50b385998668bc2978e0949897e071b43ea3 | |
parent | 6d99ba41a72c1213f2029e6fc66aa7943339b5db (diff) |
f2fs: enable in-place-update for fdatasync
This patch enforces in-place-updates only when fdatasync is requested.
If we adopt this in-place-updates for the fdatasync, we can skip to write the
recovery information.
Reviewed-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r-- | fs/f2fs/f2fs.h | 1 | ||||
-rw-r--r-- | fs/f2fs/file.c | 7 | ||||
-rw-r--r-- | fs/f2fs/segment.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index ab3602576fb2..8f8685e16863 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h | |||
@@ -998,6 +998,7 @@ enum { | |||
998 | FI_INLINE_DATA, /* used for inline data*/ | 998 | FI_INLINE_DATA, /* used for inline data*/ |
999 | FI_APPEND_WRITE, /* inode has appended data */ | 999 | FI_APPEND_WRITE, /* inode has appended data */ |
1000 | FI_UPDATE_WRITE, /* inode has in-place-update data */ | 1000 | FI_UPDATE_WRITE, /* inode has in-place-update data */ |
1001 | FI_NEED_IPU, /* used fo ipu for fdatasync */ | ||
1001 | }; | 1002 | }; |
1002 | 1003 | ||
1003 | static inline void set_inode_flag(struct f2fs_inode_info *fi, int flag) | 1004 | static inline void set_inode_flag(struct f2fs_inode_info *fi, int flag) |
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 9b888fbf08b6..95501358932c 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c | |||
@@ -127,7 +127,14 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) | |||
127 | return 0; | 127 | return 0; |
128 | 128 | ||
129 | trace_f2fs_sync_file_enter(inode); | 129 | trace_f2fs_sync_file_enter(inode); |
130 | |||
131 | /* if fdatasync is triggered, let's do in-place-update */ | ||
132 | if (datasync) | ||
133 | set_inode_flag(fi, FI_NEED_IPU); | ||
134 | |||
130 | ret = filemap_write_and_wait_range(inode->i_mapping, start, end); | 135 | ret = filemap_write_and_wait_range(inode->i_mapping, start, end); |
136 | if (datasync) | ||
137 | clear_inode_flag(fi, FI_NEED_IPU); | ||
131 | if (ret) { | 138 | if (ret) { |
132 | trace_f2fs_sync_file_exit(inode, need_cp, datasync, ret); | 139 | trace_f2fs_sync_file_exit(inode, need_cp, datasync, ret); |
133 | return ret; | 140 | return ret; |
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index ee5c75e08d9c..55973f7b0330 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h | |||
@@ -486,6 +486,10 @@ static inline bool need_inplace_update(struct inode *inode) | |||
486 | if (S_ISDIR(inode->i_mode)) | 486 | if (S_ISDIR(inode->i_mode)) |
487 | return false; | 487 | return false; |
488 | 488 | ||
489 | /* this is only set during fdatasync */ | ||
490 | if (is_inode_flag_set(F2FS_I(inode), FI_NEED_IPU)) | ||
491 | return true; | ||
492 | |||
489 | switch (SM_I(sbi)->ipu_policy) { | 493 | switch (SM_I(sbi)->ipu_policy) { |
490 | case F2FS_IPU_FORCE: | 494 | case F2FS_IPU_FORCE: |
491 | return true; | 495 | return true; |