diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 63d190264a3603285d718679ab26b042fe9a7d5f..19ad0669447876afc5cdadc5bee82dd9a05a3952 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -226,7 +226,7 @@ static void __set_data_blkaddr(struct dnode_of_data *dn, block_t new_addr) struct page *node_page = dn->node_page; unsigned int ofs_in_node = dn->ofs_in_node; - f2fs_wait_on_page_writeback(node_page, NODE, false); + f2fs_wait_on_page_writeback(node_page, NODE); rn = F2FS_NODE(node_page); diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 5f7dc4f6eb09abf1083fa19c33206c82ba31ba1a..8466b5ea76f7c4f58c7e1aed59d5dfdee956f91b 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1132,7 +1132,7 @@ void rewrite_node_page(struct f2fs_sb_info *, struct page *, struct f2fs_summary *, block_t, block_t); void allocate_data_block(struct f2fs_sb_info *, struct page *, block_t, block_t *, struct f2fs_summary *, int); -void f2fs_wait_on_page_writeback(struct page *, enum page_type, bool); +void f2fs_wait_on_page_writeback(struct page *, enum page_type); void write_data_summaries(struct f2fs_sb_info *, block_t); void write_node_summaries(struct f2fs_sb_info *, block_t); int lookup_journal_in_cursum(struct f2fs_summary_block *, diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 9117ccaf254ae450f8c2af063364193ee104dbc5..ea0371e854b4e0244537cf3d33f5f17e147e8a25 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -428,7 +428,7 @@ static void gc_node_segment(struct f2fs_sb_info *sbi, /* set page dirty and write it */ if (gc_type == FG_GC) { - f2fs_wait_on_page_writeback(node_page, NODE, true); + f2fs_wait_on_page_writeback(node_page, NODE); set_page_dirty(node_page); } else { if (!PageWriteback(node_page)) @@ -533,7 +533,7 @@ static void move_data_page(struct inode *inode, struct page *page, int gc_type) } else { struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); - f2fs_wait_on_page_writeback(page, DATA, true); + f2fs_wait_on_page_writeback(page, DATA); if (clear_page_dirty_for_io(page) && S_ISDIR(inode->i_mode)) { diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index e0d800a1d79fa7afddda5beb756c673d1ed93582..31ee5b164ff9f0ee27fa291bbd45df49e0da8d80 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -106,7 +106,7 @@ static int __f2fs_convert_inline_data(struct inode *inode, struct page *page) set_page_writeback(page); write_data_page(page, &dn, &new_blk_addr, &fio); update_extent_cache(new_blk_addr, &dn); - f2fs_wait_on_page_writeback(page, DATA, true); + f2fs_wait_on_page_writeback(page, DATA); /* clear inline data and flag after data writeback */ zero_user_segment(ipage, INLINE_DATA_OFFSET, diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 915f9a8f3ee6a1c479f9e65d1c2cda0bbfd45b31..ffa4c6d0fab407f1235adcc66d4d18619be418f2 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -175,7 +175,7 @@ void update_inode(struct inode *inode, struct page *node_page) { struct f2fs_inode *ri; - f2fs_wait_on_page_writeback(node_page, NODE, false); + f2fs_wait_on_page_writeback(node_page, NODE); ri = F2FS_INODE(node_page); diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 5f84639354e3adaa17209aa4daebbc5ee785c009..a934e6f2738b67de7962f48535974a848396d9b3 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1053,7 +1053,7 @@ void rewrite_node_page(struct f2fs_sb_info *sbi, } void f2fs_wait_on_page_writeback(struct page *page, - enum page_type type, bool sync) + enum page_type type) { struct f2fs_sb_info *sbi = F2FS_SB(page->mapping->host->i_sb); if (PageWriteback(page)) {