f2fs: convert f2fs_write_single_data_page() to use folio

Convert to use folio, so that we can get rid of 'page->index' to
prepare for removal of 'index' field in structure page [1].

[1] https://lore.kernel.org/all/Zp8fgUSIBGQ1TN0D@casper.infradead.org/

Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-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 a96c7b16fe190c546b180b9c9941ca252ae7c2ab..630bb78655d52de63fc2bc554310787a55024235 100644 (file)
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -1543,7 +1543,8 @@ continue_unlock:
                if (!clear_page_dirty_for_io(cc->rpages[i]))
                        goto continue_unlock;
 
-               ret = f2fs_write_single_data_page(cc->rpages[i], &submitted,
+               ret = f2fs_write_single_data_page(page_folio(cc->rpages[i]),
+                                               &submitted,
                                                NULL, NULL, wbc, io_type,
                                                compr_blocks, false);
                if (ret) {

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 6d2a37db0c9ed799dff281929f87c7639d0edd5e..0779e222f709be7e1fcfc3bdf015fbbde885e957 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2764,7 +2764,7 @@ out:
        return err;
 }
 
-int f2fs_write_single_data_page(struct page *page, int *submitted,
+int f2fs_write_single_data_page(struct folio *folio, int *submitted,
                                struct bio **bio,
                                sector_t *last_block,
                                struct writeback_control *wbc,
@@ -2772,12 +2772,13 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,
                                int compr_blocks,
                                bool allow_balance)
 {
-       struct inode *inode = page->mapping->host;
+       struct inode *inode = folio->mapping->host;
+       struct page *page = folio_page(folio, 0);
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        loff_t i_size = i_size_read(inode);
        const pgoff_t end_index = ((unsigned long long)i_size)
                                                        >> PAGE_SHIFT;
-       loff_t psize = (loff_t)(page->index + 1) << PAGE_SHIFT;
+       loff_t psize = (loff_t)(folio->index + 1) << PAGE_SHIFT;
        unsigned offset = 0;
        bool need_balance_fs = false;
        bool quota_inode = IS_NOQUOTA(inode);
@@ -2801,11 +2802,11 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,
                .last_block = last_block,
        };
 
-       trace_f2fs_writepage(page_folio(page), DATA);
+       trace_f2fs_writepage(folio, DATA);
 
        /* we should bypass data pages to proceed the kworker jobs */
        if (unlikely(f2fs_cp_error(sbi))) {
-               mapping_set_error(page->mapping, -EIO);
+               mapping_set_error(folio->mapping, -EIO);
                /*
                 * don't drop any dirty dentry pages for keeping lastest
                 * directory structure.
@@ -2823,7 +2824,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,
        if (unlikely(is_sbi_flag_set(sbi, SBI_POR_DOING)))
                goto redirty_out;
 
-       if (page->index < end_index ||
+       if (folio->index < end_index ||
                        f2fs_verity_in_progress(inode) ||
                        compr_blocks)
                goto write;
@@ -2833,10 +2834,10 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,
         * this page does not have to be written to disk.
         */
        offset = i_size & (PAGE_SIZE - 1);
-       if ((page->index >= end_index + 1) || !offset)
+       if ((folio->index >= end_index + 1) || !offset)
                goto out;
 
-       zero_user_segment(page, offset, PAGE_SIZE);
+       folio_zero_segment(folio, offset, folio_size(folio));
 write:
        /* Dentry/quota blocks are controlled by checkpoint */
        if (S_ISDIR(inode->i_mode) || quota_inode) {
@@ -2896,7 +2897,7 @@ done:
 out:
        inode_dec_dirty_pages(inode);
        if (err) {
-               ClearPageUptodate(page);
+               folio_clear_uptodate(folio);
                clear_page_private_gcing(page);
        }
 
@@ -2906,7 +2907,7 @@ out:
                f2fs_remove_dirty_inode(inode);
                submitted = NULL;
        }
-       unlock_page(page);
+       folio_unlock(folio);
        if (!S_ISDIR(inode->i_mode) && !IS_NOQUOTA(inode) &&
                        !F2FS_I(inode)->wb_task && allow_balance)
                f2fs_balance_fs(sbi, need_balance_fs);
@@ -2924,7 +2925,7 @@ out:
        return 0;
 
 redirty_out:
-       redirty_page_for_writepage(wbc, page);
+       folio_redirty_for_writepage(wbc, folio);
        /*
         * pageout() in MM translates EAGAIN, so calls handle_write_error()
         * -> mapping_set_error() -> set_bit(AS_EIO, ...).
@@ -2933,7 +2934,7 @@ redirty_out:
         */
        if (!err || wbc->for_reclaim)
                return AOP_WRITEPAGE_ACTIVATE;
-       unlock_page(page);
+       folio_unlock(folio);
        return err;
 }
 
@@ -2955,7 +2956,7 @@ static int f2fs_write_data_page(struct page *page,
 out:
 #endif
 
-       return f2fs_write_single_data_page(page, NULL, NULL, NULL,
+       return f2fs_write_single_data_page(page_folio(page), NULL, NULL, NULL,
                                                wbc, FS_DATA_IO, 0, true);
 }
 
@@ -3165,7 +3166,7 @@ continue_unlock:
                                continue;
                        }
 #endif
-                       ret = f2fs_write_single_data_page(&folio->page,
+                       ret = f2fs_write_single_data_page(folio,
                                        &submitted, &bio, &last_block,
                                        wbc, io_type, 0, true);
                        if (ret == AOP_WRITEPAGE_ACTIVATE)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 12f6589c83b956543305680e8a374fb16c96a631..994661d976350a62e481db11defad3f49661d61a 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3881,7 +3881,7 @@ int f2fs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
 int f2fs_encrypt_one_page(struct f2fs_io_info *fio);
 bool f2fs_should_update_inplace(struct inode *inode, struct f2fs_io_info *fio);
 bool f2fs_should_update_outplace(struct inode *inode, struct f2fs_io_info *fio);
-int f2fs_write_single_data_page(struct page *page, int *submitted,
+int f2fs_write_single_data_page(struct folio *folio, int *submitted,
                                struct bio **bio, sector_t *last_block,
                                struct writeback_control *wbc,
                                enum iostat_type io_type,