f2fs: Pass a folio to f2fs_do_read_inline_data()

All callers now have a folio, so pass it in.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-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 bead3fcbfdbb4adcdc6384227a29e484bad2edb6..757dbf7783143d4f598d4af2f8c81d4d0728a595 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3388,7 +3388,7 @@ restart:
 
        if (f2fs_has_inline_data(inode)) {
                if (pos + len <= MAX_INLINE_DATA(inode)) {
-                       f2fs_do_read_inline_data(folio, &ifolio->page);
+                       f2fs_do_read_inline_data(folio, ifolio);
                        set_inode_flag(inode, FI_DATA_EXIST);
                        if (inode->i_nlink)
                                set_page_private_inline(&ifolio->page);

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 6e0d8b2972dd881a4cb83b54d1c86374139e58c4..4eccaa0a4863a3c1dd778c769afeab6eb942f5be 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4287,7 +4287,7 @@ extern struct kmem_cache *f2fs_inode_entry_slab;
 bool f2fs_may_inline_data(struct inode *inode);
 bool f2fs_sanity_check_inline_data(struct inode *inode, struct page *ipage);
 bool f2fs_may_inline_dentry(struct inode *inode);
-void f2fs_do_read_inline_data(struct folio *folio, struct page *ipage);
+void f2fs_do_read_inline_data(struct folio *folio, struct folio *ifolio);
 void f2fs_truncate_inline_inode(struct inode *inode,
                                                struct page *ipage, u64 from);
 int f2fs_read_inline_data(struct inode *inode, struct folio *folio);

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 7a5481006ed3c9d5f7b2bc40efe7480edc0a290e..39b936be6ca8417208c41f92078490bb53c3fd2f 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -79,7 +79,7 @@ bool f2fs_may_inline_dentry(struct inode *inode)
        return true;
 }
 
-void f2fs_do_read_inline_data(struct folio *folio, struct page *ipage)
+void f2fs_do_read_inline_data(struct folio *folio, struct folio *ifolio)
 {
        struct inode *inode = folio->mapping->host;
 
@@ -91,7 +91,7 @@ void f2fs_do_read_inline_data(struct folio *folio, struct page *ipage)
        folio_zero_segment(folio, MAX_INLINE_DATA(inode), folio_size(folio));
 
        /* Copy the whole inline data block */
-       memcpy_to_folio(folio, 0, inline_data_addr(inode, ipage),
+       memcpy_to_folio(folio, 0, inline_data_addr(inode, &ifolio->page),
                       MAX_INLINE_DATA(inode));
        if (!folio_test_uptodate(folio))
                folio_mark_uptodate(folio);
@@ -133,7 +133,7 @@ int f2fs_read_inline_data(struct inode *inode, struct folio *folio)
        if (folio_index(folio))
                folio_zero_segment(folio, 0, folio_size(folio));
        else
-               f2fs_do_read_inline_data(folio, &ifolio->page);
+               f2fs_do_read_inline_data(folio, ifolio);
 
        if (!folio_test_uptodate(folio))
                folio_mark_uptodate(folio);
@@ -184,7 +184,7 @@ int f2fs_convert_inline_folio(struct dnode_of_data *dn, struct folio *folio)
 
        f2fs_bug_on(F2FS_F_SB(folio), folio_test_writeback(folio));
 
-       f2fs_do_read_inline_data(folio, &dn->inode_folio->page);
+       f2fs_do_read_inline_data(folio, dn->inode_folio);
        folio_mark_dirty(folio);
 
        /* clear dirty state */