f2fs: convert f2fs_write_end() 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>
Reviewed-by: Li Zetao <lizetao1@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 85ac05c3655a5890b0fa2c6784f23deaca450dbd..e114d738b6b4ace9a58e6f8678f3d7d36cac8364 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3698,7 +3698,8 @@ static int f2fs_write_end(struct file *file,
                        loff_t pos, unsigned len, unsigned copied,
                        struct page *page, void *fsdata)
 {
-       struct inode *inode = page->mapping->host;
+       struct folio *folio = page_folio(page);
+       struct inode *inode = folio->mapping->host;
 
        trace_f2fs_write_end(inode, pos, len, copied);
 
@@ -3707,17 +3708,17 @@ static int f2fs_write_end(struct file *file,
         * should be PAGE_SIZE. Otherwise, we treat it with zero copied and
         * let generic_perform_write() try to copy data again through copied=0.
         */
-       if (!PageUptodate(page)) {
+       if (!folio_test_uptodate(folio)) {
                if (unlikely(copied != len))
                        copied = 0;
                else
-                       SetPageUptodate(page);
+                       folio_mark_uptodate(folio);
        }
 
 #ifdef CONFIG_F2FS_FS_COMPRESSION
        /* overwrite compressed file */
        if (f2fs_compressed_file(inode) && fsdata) {
-               f2fs_compress_write_end(inode, fsdata, page->index, copied);
+               f2fs_compress_write_end(inode, fsdata, folio->index, copied);
                f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
 
                if (pos + copied > i_size_read(inode) &&
@@ -3730,10 +3731,10 @@ static int f2fs_write_end(struct file *file,
        if (!copied)
                goto unlock_out;
 
-       set_page_dirty(page);
+       folio_mark_dirty(folio);
 
        if (f2fs_is_atomic_file(inode))
-               set_page_private_atomic(page);
+               set_page_private_atomic(folio_page(folio, 0));
 
        if (pos + copied > i_size_read(inode) &&
            !f2fs_verity_in_progress(inode)) {