aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk.kim@samsung.com>2014-01-20 23:32:12 -0500
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2014-01-22 04:40:34 -0500
commita18ff063406dd6aec41fda598eabe2691007a30d (patch)
treee38d3496b818e75bde2cbb18c949efb8e906c713
parent6c311ec6c2d9e015d454b4e3fda8008b5bebf316 (diff)
f2fs: call mark_inode_dirty to flush dirty pages
If a dentry page is updated, we should call mark_inode_dirty to add the inode into the dirty list, so that its dentry pages are flushed to the disk. Otherwise, the inode can be evicted without flush. Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
-rw-r--r--fs/f2fs/data.c4
-rw-r--r--fs/f2fs/dir.c6
-rw-r--r--fs/f2fs/namei.c3
3 files changed, 8 insertions, 5 deletions
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index f5fac16bc6e7..0ae558723506 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -249,6 +249,7 @@ int reserve_new_block(struct dnode_of_data *dn)
249 249
250 __set_data_blkaddr(dn, NEW_ADDR); 250 __set_data_blkaddr(dn, NEW_ADDR);
251 dn->data_blkaddr = NEW_ADDR; 251 dn->data_blkaddr = NEW_ADDR;
252 mark_inode_dirty(dn->inode);
252 sync_inode_page(dn); 253 sync_inode_page(dn);
253 return 0; 254 return 0;
254} 255}
@@ -564,7 +565,6 @@ repeat:
564 i_size_write(inode, ((index + 1) << PAGE_CACHE_SHIFT)); 565 i_size_write(inode, ((index + 1) << PAGE_CACHE_SHIFT));
565 /* Only the directory inode sets new_i_size */ 566 /* Only the directory inode sets new_i_size */
566 set_inode_flag(F2FS_I(inode), FI_UPDATE_DIR); 567 set_inode_flag(F2FS_I(inode), FI_UPDATE_DIR);
567 mark_inode_dirty_sync(inode);
568 } 568 }
569 return page; 569 return page;
570 570
@@ -1060,6 +1060,8 @@ static int f2fs_set_data_page_dirty(struct page *page)
1060 trace_f2fs_set_page_dirty(page, DATA); 1060 trace_f2fs_set_page_dirty(page, DATA);
1061 1061
1062 SetPageUptodate(page); 1062 SetPageUptodate(page);
1063 mark_inode_dirty(inode);
1064
1063 if (!PageDirty(page)) { 1065 if (!PageDirty(page)) {
1064 __set_page_dirty_nobuffers(page); 1066 __set_page_dirty_nobuffers(page);
1065 set_dirty_dir_page(inode, page); 1067 set_dirty_dir_page(inode, page);
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index cd055b6fcffe..b2b77ccea82b 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -388,6 +388,8 @@ static void update_parent_metadata(struct inode *dir, struct inode *inode,
388 clear_inode_flag(F2FS_I(inode), FI_NEW_INODE); 388 clear_inode_flag(F2FS_I(inode), FI_NEW_INODE);
389 } 389 }
390 dir->i_mtime = dir->i_ctime = CURRENT_TIME; 390 dir->i_mtime = dir->i_ctime = CURRENT_TIME;
391 mark_inode_dirty(dir);
392
391 if (F2FS_I(dir)->i_current_depth != current_depth) { 393 if (F2FS_I(dir)->i_current_depth != current_depth) {
392 F2FS_I(dir)->i_current_depth = current_depth; 394 F2FS_I(dir)->i_current_depth = current_depth;
393 set_inode_flag(F2FS_I(dir), FI_UPDATE_DIR); 395 set_inode_flag(F2FS_I(dir), FI_UPDATE_DIR);
@@ -395,8 +397,6 @@ static void update_parent_metadata(struct inode *dir, struct inode *inode,
395 397
396 if (is_inode_flag_set(F2FS_I(dir), FI_UPDATE_DIR)) 398 if (is_inode_flag_set(F2FS_I(dir), FI_UPDATE_DIR))
397 update_inode_page(dir); 399 update_inode_page(dir);
398 else
399 mark_inode_dirty(dir);
400 400
401 if (is_inode_flag_set(F2FS_I(inode), FI_INC_LINK)) 401 if (is_inode_flag_set(F2FS_I(inode), FI_INC_LINK))
402 clear_inode_flag(F2FS_I(inode), FI_INC_LINK); 402 clear_inode_flag(F2FS_I(inode), FI_INC_LINK);
@@ -553,8 +553,6 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
553 if (inode && S_ISDIR(inode->i_mode)) { 553 if (inode && S_ISDIR(inode->i_mode)) {
554 drop_nlink(dir); 554 drop_nlink(dir);
555 update_inode_page(dir); 555 update_inode_page(dir);
556 } else {
557 mark_inode_dirty(dir);
558 } 556 }
559 557
560 if (inode) { 558 if (inode) {
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index a68838dae335..3d32f2969c5e 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -430,6 +430,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
430 if (old_dir_entry) 430 if (old_dir_entry)
431 drop_nlink(new_inode); 431 drop_nlink(new_inode);
432 drop_nlink(new_inode); 432 drop_nlink(new_inode);
433 mark_inode_dirty(new_inode);
433 434
434 if (!new_inode->i_nlink) 435 if (!new_inode->i_nlink)
435 add_orphan_inode(sbi, new_inode->i_ino); 436 add_orphan_inode(sbi, new_inode->i_ino);
@@ -459,11 +460,13 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
459 f2fs_set_link(old_inode, old_dir_entry, 460 f2fs_set_link(old_inode, old_dir_entry,
460 old_dir_page, new_dir); 461 old_dir_page, new_dir);
461 F2FS_I(old_inode)->i_pino = new_dir->i_ino; 462 F2FS_I(old_inode)->i_pino = new_dir->i_ino;
463 update_inode_page(old_inode);
462 } else { 464 } else {
463 kunmap(old_dir_page); 465 kunmap(old_dir_page);
464 f2fs_put_page(old_dir_page, 0); 466 f2fs_put_page(old_dir_page, 0);
465 } 467 }
466 drop_nlink(old_dir); 468 drop_nlink(old_dir);
469 mark_inode_dirty(old_dir);
467 update_inode_page(old_dir); 470 update_inode_page(old_dir);
468 } 471 }
469 472