Browse Source

f2fs: wait on page's writeback in writepages path

Likewise f2fs_write_cache_pages, let's do for node and meta pages too.
Especially, for node blocks, we should do this before marking its fsync
and dentry flags.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Jaegeuk Kim 9 years ago
parent
commit
fa3d2bdf94
2 changed files with 6 additions and 3 deletions
  1. 3 1
      fs/f2fs/checkpoint.c
  2. 3 2
      fs/f2fs/node.c

+ 3 - 1
fs/f2fs/checkpoint.c

@@ -232,7 +232,6 @@ static int f2fs_write_meta_page(struct page *page,
 	if (unlikely(f2fs_cp_error(sbi)))
 	if (unlikely(f2fs_cp_error(sbi)))
 		goto redirty_out;
 		goto redirty_out;
 
 
-	f2fs_wait_on_page_writeback(page, META, true);
 	write_meta_page(sbi, page);
 	write_meta_page(sbi, page);
 	dec_page_count(sbi, F2FS_DIRTY_META);
 	dec_page_count(sbi, F2FS_DIRTY_META);
 	unlock_page(page);
 	unlock_page(page);
@@ -315,6 +314,9 @@ continue_unlock:
 				goto continue_unlock;
 				goto continue_unlock;
 			}
 			}
 
 
+			f2fs_wait_on_page_writeback(page, META, true);
+
+			BUG_ON(PageWriteback(page));
 			if (!clear_page_dirty_for_io(page))
 			if (!clear_page_dirty_for_io(page))
 				goto continue_unlock;
 				goto continue_unlock;
 
 

+ 3 - 2
fs/f2fs/node.c

@@ -1297,6 +1297,9 @@ continue_unlock:
 				continue;
 				continue;
 			}
 			}
 
 
+			f2fs_wait_on_page_writeback(page, NODE, true);
+
+			BUG_ON(PageWriteback(page));
 			if (!clear_page_dirty_for_io(page))
 			if (!clear_page_dirty_for_io(page))
 				goto continue_unlock;
 				goto continue_unlock;
 
 
@@ -1402,8 +1405,6 @@ static int f2fs_write_node_page(struct page *page,
 	if (unlikely(f2fs_cp_error(sbi)))
 	if (unlikely(f2fs_cp_error(sbi)))
 		goto redirty_out;
 		goto redirty_out;
 
 
-	f2fs_wait_on_page_writeback(page, NODE, true);
-
 	/* get old block addr of this node page */
 	/* get old block addr of this node page */
 	nid = nid_of_node(page);
 	nid = nid_of_node(page);
 	f2fs_bug_on(sbi, page->index != nid);
 	f2fs_bug_on(sbi, page->index != nid);