f2fs: convert f2fs_write_inline_data() 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/data.c b/fs/f2fs/data.c
index 0df5a0c66edee189ffeff1576dd3be64257b35af..6d2a37db0c9ed799dff281929f87c7639d0edd5e 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2866,7 +2866,7 @@ write:
 
        err = -EAGAIN;
        if (f2fs_has_inline_data(inode)) {
-               err = f2fs_write_inline_data(inode, page);
+               err = f2fs_write_inline_data(inode, folio);
                if (!err)
                        goto out;
        }

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index fafc648a66428370b952347d5586d7c671b3fa91..12f6589c83b956543305680e8a374fb16c96a631 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4185,7 +4185,7 @@ int f2fs_read_inline_data(struct inode *inode, struct folio *folio);
 int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page);
 int f2fs_convert_inline_inode(struct inode *inode);
 int f2fs_try_convert_inline_dir(struct inode *dir, struct dentry *dentry);
-int f2fs_write_inline_data(struct inode *inode, struct page *page);
+int f2fs_write_inline_data(struct inode *inode, struct folio *folio);
 int f2fs_recover_inline_data(struct inode *inode, struct page *npage);
 struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,
                                        const struct f2fs_filename *fname,

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 98d122164cd10700a265c0f41742c3070d4b8398..005babf1bed1e3d51084cb057710fc1d8383897a 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -260,7 +260,7 @@ out:
        return err;
 }
 
-int f2fs_write_inline_data(struct inode *inode, struct page *page)
+int f2fs_write_inline_data(struct inode *inode, struct folio *folio)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        struct page *ipage;
@@ -274,14 +274,14 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page)
                return -EAGAIN;
        }
 
-       f2fs_bug_on(F2FS_I_SB(inode), page->index);
+       f2fs_bug_on(F2FS_I_SB(inode), folio->index);
 
        f2fs_wait_on_page_writeback(ipage, NODE, true, true);
-       memcpy_from_page(inline_data_addr(inode, ipage),
-                        page, 0, MAX_INLINE_DATA(inode));
+       memcpy_from_folio(inline_data_addr(inode, ipage),
+                        folio, 0, MAX_INLINE_DATA(inode));
        set_page_dirty(ipage);
 
-       f2fs_clear_page_cache_dirty_tag(page_folio(page));
+       f2fs_clear_page_cache_dirty_tag(folio);
 
        set_inode_flag(inode, FI_APPEND_WRITE);
        set_inode_flag(inode, FI_DATA_EXIST);

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 20518c12f5b77c64b06a1f4f54d92bb048376e6e..2b764c86aacc7110c793edcfce8adf47d2924456 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1535,7 +1535,7 @@ static void flush_inline_data(struct f2fs_sb_info *sbi, nid_t ino)
        if (!clear_page_dirty_for_io(page))
                goto page_out;
 
-       ret = f2fs_write_inline_data(inode, page);
+       ret = f2fs_write_inline_data(inode, page_folio(page));
        inode_dec_dirty_pages(inode);
        f2fs_remove_dirty_inode(inode);
        if (ret)