f2fs: use folio_test_writeback

Let's convert PageWriteback to folio_test_writeback.

Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 8892c82621414602e50b070d2187d9f66c0e23a5..d67c471ab5df6de10ae55764ae2e78fccef444ae 100644 (file)
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -1484,7 +1484,7 @@ continue_unlock:
                if (!PageDirty(cc->rpages[i]))
                        goto continue_unlock;
 
-               if (PageWriteback(cc->rpages[i])) {
+               if (folio_test_writeback(page_folio(cc->rpages[i]))) {
                        if (wbc->sync_mode == WB_SYNC_NONE)
                                goto continue_unlock;
                        f2fs_wait_on_page_writeback(cc->rpages[i], DATA, true, true);

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 0d88649c60a50dcfd0f843654e991eb9279bf5de..5d641fac02ba77506afdad8f6e246ce361e8deec 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2704,8 +2704,7 @@ got_it:
                if (err) {
                        if (fscrypt_inode_uses_fs_layer_crypto(inode))
                                fscrypt_finalize_bounce_page(&fio->encrypted_page);
-                       if (PageWriteback(page))
-                               end_page_writeback(page);
+                       end_page_writeback(page);
                } else {
                        set_inode_flag(inode, FI_UPDATE_WRITE);
                }

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index e9ef971f4dba6f145d70e03c8404bd4a36250f9a..dd530dc700052cbce4ce116801b13a7fd9825788 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4660,7 +4660,7 @@ static inline void f2fs_truncate_meta_inode_pages(struct f2fs_sb_info *sbi,
 
                page = find_get_page(META_MAPPING(sbi), blkaddr + i);
                if (page) {
-                       if (PageWriteback(page))
+                       if (folio_test_writeback(page_folio(page)))
                                need_submit = true;
                        f2fs_put_page(page, 0);
                }

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 8852814dab7f625a9e01032892ed586ad86f26f5..ac4cbbe50c2fc4bd3392665e75e3bc354d3fb416 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -1434,7 +1434,7 @@ static int move_data_page(struct inode *inode, block_t bidx, int gc_type,
                goto out;
 
        if (gc_type == BG_GC) {
-               if (PageWriteback(page)) {
+               if (folio_test_writeback(page_folio(page))) {
                        err = -EAGAIN;
                        goto out;
                }

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index ac00423f117b5cb14af48a7cf579c2de76add278..3d3218a4b29dfef126f9fa34441cd0682ccc978e 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -164,7 +164,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)
                return -EFSCORRUPTED;
        }
 
-       f2fs_bug_on(F2FS_P_SB(page), PageWriteback(page));
+       f2fs_bug_on(F2FS_P_SB(page), folio_test_writeback(page_folio(page)));
 
        f2fs_do_read_inline_data(page, dn->inode_page);
        set_page_dirty(page);

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 12b1fef31f4375a7a48cde84a8053e9ddddebe78..d7a5a88a1a5eb1f3f710483435743f0aeb3ed607 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -161,7 +161,8 @@ bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct page *page)
        if (!f2fs_enable_inode_chksum(sbi, page))
 #else
        if (!f2fs_enable_inode_chksum(sbi, page) ||
-                       PageDirty(page) || PageWriteback(page))
+                       PageDirty(page) ||
+                       folio_test_writeback(page_folio(page)))
 #endif
                return true;
 

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index bb57bbaff7b4f278da588e83cb4dbf9eae63832e..3b9eb569368326cff3009035174fadbf3c0adbd9 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1743,7 +1743,7 @@ int f2fs_move_node_page(struct page *node_page, int gc_type)
                goto release_page;
        } else {
                /* set page dirty and write it */
-               if (!PageWriteback(node_page))
+               if (!folio_test_writeback(page_folio(node_page)))
                        set_page_dirty(node_page);
        }
 out_page:

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 6474b7338e8112ef17dd01c11779877dd60a7cc8..f0da516ba8dc3d997e1e66fe4c9ff2c97e839691 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -3614,13 +3614,13 @@ skip_new_segment:
        mutex_unlock(&curseg->curseg_mutex);
        f2fs_up_read(&SM_I(sbi)->curseg_lock);
        return 0;
+
 out_err:
        *new_blkaddr = NULL_ADDR;
        up_write(&sit_i->sentry_lock);
        mutex_unlock(&curseg->curseg_mutex);
        f2fs_up_read(&SM_I(sbi)->curseg_lock);
        return ret;
-
 }
 
 void f2fs_update_device_state(struct f2fs_sb_info *sbi, nid_t ino,
@@ -3662,8 +3662,7 @@ static void do_write_page(struct f2fs_summary *sum, struct f2fs_io_info *fio)
                        &fio->new_blkaddr, sum, type, fio)) {
                if (fscrypt_inode_uses_fs_layer_crypto(fio->page->mapping->host))
                        fscrypt_finalize_bounce_page(&fio->encrypted_page);
-               if (PageWriteback(fio->page))
-                       end_page_writeback(fio->page);
+               end_page_writeback(fio->page);
                if (f2fs_in_warm_node_list(fio->sbi, fio->page))
                        f2fs_del_fsync_node_entry(fio->sbi, fio->page);
                goto out;
@@ -3906,7 +3905,7 @@ void f2fs_replace_block(struct f2fs_sb_info *sbi, struct dnode_of_data *dn,
 void f2fs_wait_on_page_writeback(struct page *page,
                                enum page_type type, bool ordered, bool locked)
 {
-       if (PageWriteback(page)) {
+       if (folio_test_writeback(page_folio(page))) {
                struct f2fs_sb_info *sbi = F2FS_P_SB(page);
 
                /* submit cached LFS IO */
@@ -3915,7 +3914,8 @@ void f2fs_wait_on_page_writeback(struct page *page,
                f2fs_submit_merged_ipu_write(sbi, NULL, page);
                if (ordered) {
                        wait_on_page_writeback(page);
-                       f2fs_bug_on(sbi, locked && PageWriteback(page));
+                       f2fs_bug_on(sbi, locked &&
+                               folio_test_writeback(page_folio(page)));
                } else {
                        wait_for_stable_page(page);
                }