aboutsummaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk.kim@samsung.com>2013-03-20 01:58:38 -0400
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2013-03-26 20:16:16 -0400
commit0ff153a2f1fa7ef31d6d9bc9ce6c3815dede55e6 (patch)
treef9bf94683b0c9f19ff3606e94eceae5e6b60b7d9 /fs/f2fs
parent6ead114232f786e3ef7a034c8617f2a4df8e5226 (diff)
f2fs: do not skip writing file meta during fsync
This patch removes data_version check flow during the fsync call. The original purpose for the use of data_version was to avoid writng inode pages redundantly by the fsync calls repeatedly. However, when user can modify file meta and then call fsync, we should not skip fsync procedure. So, let's remove this condition check and hope that user triggers in right manner. Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/data.c3
-rw-r--r--fs/f2fs/f2fs.h1
-rw-r--r--fs/f2fs/file.c10
-rw-r--r--fs/f2fs/inode.c1
4 files changed, 0 insertions, 15 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index ea8be6fc38f1..47a2d7c87ea9 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -435,7 +435,6 @@ static int f2fs_read_data_pages(struct file *file,
435int do_write_data_page(struct page *page) 435int do_write_data_page(struct page *page)
436{ 436{
437 struct inode *inode = page->mapping->host; 437 struct inode *inode = page->mapping->host;
438 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
439 block_t old_blk_addr, new_blk_addr; 438 block_t old_blk_addr, new_blk_addr;
440 struct dnode_of_data dn; 439 struct dnode_of_data dn;
441 int err = 0; 440 int err = 0;
@@ -465,8 +464,6 @@ int do_write_data_page(struct page *page)
465 write_data_page(inode, page, &dn, 464 write_data_page(inode, page, &dn,
466 old_blk_addr, &new_blk_addr); 465 old_blk_addr, &new_blk_addr);
467 update_extent_cache(new_blk_addr, &dn); 466 update_extent_cache(new_blk_addr, &dn);
468 F2FS_I(inode)->data_version =
469 le64_to_cpu(F2FS_CKPT(sbi)->checkpoint_ver);
470 } 467 }
471out_writepage: 468out_writepage:
472 f2fs_put_dnode(&dn); 469 f2fs_put_dnode(&dn);
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 109e12d21a36..380e2b3cdac7 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -159,7 +159,6 @@ struct f2fs_inode_info {
159 159
160 /* Use below internally in f2fs*/ 160 /* Use below internally in f2fs*/
161 unsigned long flags; /* use to pass per-file flags */ 161 unsigned long flags; /* use to pass per-file flags */
162 unsigned long long data_version;/* latest version of data for fsync */
163 atomic_t dirty_dents; /* # of dirty dentry pages */ 162 atomic_t dirty_dents; /* # of dirty dentry pages */
164 f2fs_hash_t chash; /* hash value of given file name */ 163 f2fs_hash_t chash; /* hash value of given file name */
165 unsigned int clevel; /* maximum level of given file name */ 164 unsigned int clevel; /* maximum level of given file name */
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index ff018a42e435..d65fcad578c5 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -124,7 +124,6 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
124{ 124{
125 struct inode *inode = file->f_mapping->host; 125 struct inode *inode = file->f_mapping->host;
126 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); 126 struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
127 unsigned long long cur_version;
128 int ret = 0; 127 int ret = 0;
129 bool need_cp = false; 128 bool need_cp = false;
130 struct writeback_control wbc = { 129 struct writeback_control wbc = {
@@ -148,15 +147,6 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
148 if (datasync && !(inode->i_state & I_DIRTY_DATASYNC)) 147 if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))
149 goto out; 148 goto out;
150 149
151 mutex_lock(&sbi->cp_mutex);
152 cur_version = le64_to_cpu(F2FS_CKPT(sbi)->checkpoint_ver);
153 mutex_unlock(&sbi->cp_mutex);
154
155 if (F2FS_I(inode)->data_version != cur_version &&
156 !(inode->i_state & I_DIRTY))
157 goto out;
158 F2FS_I(inode)->data_version--;
159
160 if (!S_ISREG(inode->i_mode) || inode->i_nlink != 1) 150 if (!S_ISREG(inode->i_mode) || inode->i_nlink != 1)
161 need_cp = true; 151 need_cp = true;
162 else if (is_inode_flag_set(F2FS_I(inode), FI_NEED_CP)) 152 else if (is_inode_flag_set(F2FS_I(inode), FI_NEED_CP))
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index e0e8308594a5..f798ddf2c8a8 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -80,7 +80,6 @@ static int do_read_inode(struct inode *inode)
80 fi->i_xattr_nid = le32_to_cpu(ri->i_xattr_nid); 80 fi->i_xattr_nid = le32_to_cpu(ri->i_xattr_nid);
81 fi->i_flags = le32_to_cpu(ri->i_flags); 81 fi->i_flags = le32_to_cpu(ri->i_flags);
82 fi->flags = 0; 82 fi->flags = 0;
83 fi->data_version = le64_to_cpu(F2FS_CKPT(sbi)->checkpoint_ver) - 1;
84 fi->i_advise = ri->i_advise; 83 fi->i_advise = ri->i_advise;
85 fi->i_pino = le32_to_cpu(ri->i_pino); 84 fi->i_pino = le32_to_cpu(ri->i_pino);
86 get_extent_info(&fi->ext, ri->i_ext); 85 get_extent_info(&fi->ext, ri->i_ext);