f2fs: Pass a folio to f2fs_make_empty_inline_dir()

The only caller already has a folio, so pass it in.  Removes a
hidden call to compound_head().

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/dir.c b/fs/f2fs/dir.c
index 0465c71a683a4493e291e579ac6b74c31445ce3d..10e7742c5e0b5cdd23e6d98692cdec42d7d704e7 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -499,7 +499,7 @@ static int make_empty_dir(struct inode *inode,
        struct f2fs_dentry_ptr d;
 
        if (f2fs_has_inline_dentry(inode))
-               return f2fs_make_empty_inline_dir(inode, parent, &folio->page);
+               return f2fs_make_empty_inline_dir(inode, parent, folio);
 
        dentry_folio = f2fs_get_new_data_folio(inode, folio, 0, true);
        if (IS_ERR(dentry_folio))

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index ba6e138a2700ccd49df12e79b05763c000841553..43216254a0561c5cb4f945aabbf2d8eac7ebd012 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4301,7 +4301,7 @@ struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,
                                        struct page **res_page,
                                        bool use_hash);
 int f2fs_make_empty_inline_dir(struct inode *inode, struct inode *parent,
-                       struct page *ipage);
+                       struct folio *ifolio);
 int f2fs_add_inline_entry(struct inode *dir, const struct f2fs_filename *fname,
                        struct inode *inode, nid_t ino, umode_t mode);
 void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry,

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 81a6ab05363eae73f23bdf7f59fc8b315a699513..d27205a789af88611fe21caa17b7bd5e08071ee4 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -385,17 +385,17 @@ struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,
 }
 
 int f2fs_make_empty_inline_dir(struct inode *inode, struct inode *parent,
-                                                       struct page *ipage)
+                                                       struct folio *ifolio)
 {
        struct f2fs_dentry_ptr d;
        void *inline_dentry;
 
-       inline_dentry = inline_data_addr(inode, ipage);
+       inline_dentry = inline_data_addr(inode, &ifolio->page);
 
        make_dentry_ptr_inline(inode, &d, inline_dentry);
        f2fs_do_make_empty_dir(inode, parent, &d);
 
-       set_page_dirty(ipage);
+       folio_mark_dirty(ifolio);
 
        /* update i_size to MAX_INLINE_DATA */
        if (i_size_read(inode) < MAX_INLINE_DATA(inode))