Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

f2fs: fix to reorder set_page_dirty and wait_on_page_writeback

This patch reorders flow from

- update page
- set_page_dirty
- wait_on_page_writeback

to

- wait_on_page_writeback
- update page
- set_page_dirty

The reason is:
- set_page_dirty will increase reference of dirty page, the reference
should be cleared before wait_on_page_writeback to keep its consistency.
- some devices need stable page during page writebacking, so we
should not change page's data.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

authored by

Chao Yu and committed by
Jaegeuk Kim
8d64d365 2062e0c3

+12 -8
+4 -3
fs/f2fs/checkpoint.c
··· 1290 1290 struct page *page = f2fs_grab_meta_page(sbi, blk_addr); 1291 1291 int err; 1292 1292 1293 - memcpy(page_address(page), src, PAGE_SIZE); 1294 - set_page_dirty(page); 1295 - 1296 1293 f2fs_wait_on_page_writeback(page, META, true); 1297 1294 f2fs_bug_on(sbi, PageWriteback(page)); 1295 + 1296 + memcpy(page_address(page), src, PAGE_SIZE); 1297 + 1298 + set_page_dirty(page); 1298 1299 if (unlikely(!clear_page_dirty_for_io(page))) 1299 1300 f2fs_bug_on(sbi, 1); 1300 1301
+3 -2
fs/f2fs/gc.c
··· 829 829 } 830 830 831 831 write_page: 832 - set_page_dirty(fio.encrypted_page); 833 832 f2fs_wait_on_page_writeback(fio.encrypted_page, DATA, true); 833 + set_page_dirty(fio.encrypted_page); 834 834 if (clear_page_dirty_for_io(fio.encrypted_page)) 835 835 dec_page_count(fio.sbi, F2FS_DIRTY_META); 836 836 ··· 924 924 bool is_dirty = PageDirty(page); 925 925 926 926 retry: 927 - set_page_dirty(page); 928 927 f2fs_wait_on_page_writeback(page, DATA, true); 928 + 929 + set_page_dirty(page); 929 930 if (clear_page_dirty_for_io(page)) { 930 931 inode_dec_dirty_pages(inode); 931 932 f2fs_remove_dirty_inode(inode);
+3 -2
fs/f2fs/node.c
··· 1598 1598 .for_reclaim = 0, 1599 1599 }; 1600 1600 1601 - set_page_dirty(node_page); 1602 1601 f2fs_wait_on_page_writeback(node_page, NODE, true); 1603 - 1604 1602 f2fs_bug_on(F2FS_P_SB(node_page), PageWriteback(node_page)); 1603 + 1604 + set_page_dirty(node_page); 1605 + 1605 1606 if (!clear_page_dirty_for_io(node_page)) { 1606 1607 err = -EAGAIN; 1607 1608 goto out_page;
+2 -1
fs/f2fs/segment.c
··· 387 387 if (page->mapping == inode->i_mapping) { 388 388 trace_f2fs_commit_inmem_page(page, INMEM); 389 389 390 - set_page_dirty(page); 391 390 f2fs_wait_on_page_writeback(page, DATA, true); 391 + 392 + set_page_dirty(page); 392 393 if (clear_page_dirty_for_io(page)) { 393 394 inode_dec_dirty_pages(inode); 394 395 f2fs_remove_dirty_inode(inode);