minixfs: Convert minix_set_link() and minix_dotdot() to take a folio

This matches ext2 and removes a few hidden calls to compound_head().

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index 3bbfac32d520f0869cc35d7c5df413e4d7279303..c32d182c2d74cd8bf924fcb1d447c824eb7ae84f 100644 (file)
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -404,40 +404,37 @@ not_empty:
 }
 
 /* Releases the page */
-int minix_set_link(struct minix_dir_entry *de, struct page *page,
+int minix_set_link(struct minix_dir_entry *de, struct folio *folio,
                struct inode *inode)
 {
-       struct inode *dir = page->mapping->host;
+       struct inode *dir = folio->mapping->host;
        struct minix_sb_info *sbi = minix_sb(dir->i_sb);
-       loff_t pos = page_offset(page) + offset_in_page(de);
+       loff_t pos = folio_pos(folio) + offset_in_folio(folio, de);
        int err;
 
-       lock_page(page);
-       err = minix_prepare_chunk(page, pos, sbi->s_dirsize);
+       folio_lock(folio);
+       err = minix_prepare_chunk(&folio->page, pos, sbi->s_dirsize);
        if (err) {
-               unlock_page(page);
+               folio_unlock(folio);
                return err;
        }
        if (sbi->s_version == MINIX_V3)
                ((minix3_dirent *)de)->inode = inode->i_ino;
        else
                de->inode = inode->i_ino;
-       dir_commit_chunk(page, pos, sbi->s_dirsize);
+       dir_commit_chunk(&folio->page, pos, sbi->s_dirsize);
        inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir));
        mark_inode_dirty(dir);
        return minix_handle_dirsync(dir);
 }
 
-struct minix_dir_entry * minix_dotdot (struct inode *dir, struct page **p)
+struct minix_dir_entry *minix_dotdot(struct inode *dir, struct folio **foliop)
 {
-       struct folio *folio;
        struct minix_sb_info *sbi = minix_sb(dir->i_sb);
-       struct minix_dir_entry *de = dir_get_folio(dir, 0, &folio);
+       struct minix_dir_entry *de = dir_get_folio(dir, 0, foliop);
 
-       if (!IS_ERR(de)) {
-               *p = &folio->page;
+       if (!IS_ERR(de))
                return minix_next_entry(de, sbi);
-       }
        return NULL;
 }
 

diff --git a/fs/minix/minix.h b/fs/minix/minix.h
index a290dd483e69b75c35e124f39b7c6d07e6543bb5..6ed34209ed33f909e3b0de8b55d14770f06c2c32 100644 (file)
--- a/fs/minix/minix.h
+++ b/fs/minix/minix.h
@@ -69,9 +69,9 @@ int minix_add_link(struct dentry*, struct inode*);
 int minix_delete_entry(struct minix_dir_entry*, struct page*);
 int minix_make_empty(struct inode*, struct inode*);
 int minix_empty_dir(struct inode*);
-int minix_set_link(struct minix_dir_entry *de, struct page *page,
+int minix_set_link(struct minix_dir_entry *de, struct folio *folio,
                struct inode *inode);
-struct minix_dir_entry *minix_dotdot(struct inode*, struct page**);
+struct minix_dir_entry *minix_dotdot(struct inode*, struct folio **);
 ino_t minix_inode_by_name(struct dentry*);
 
 extern const struct inode_operations minix_file_inode_operations;

diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index 117264877bd7775c5b3f7d689474c72b296f2adb..ba82fa3332f12d03a0e0209608feeb0799ea9242 100644 (file)
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -180,7 +180,7 @@ static int minix_rename(struct mnt_idmap *idmap,
 {
        struct inode * old_inode = d_inode(old_dentry);
        struct inode * new_inode = d_inode(new_dentry);
-       struct page * dir_page = NULL;
+       struct folio * dir_folio = NULL;
        struct minix_dir_entry * dir_de = NULL;
        struct folio *old_folio;
        struct minix_dir_entry * old_de;
@@ -195,7 +195,7 @@ static int minix_rename(struct mnt_idmap *idmap,
 
        if (S_ISDIR(old_inode->i_mode)) {
                err = -EIO;
-               dir_de = minix_dotdot(old_inode, &dir_page);
+               dir_de = minix_dotdot(old_inode, &dir_folio);
                if (!dir_de)
                        goto out_old;
        }
@@ -212,7 +212,7 @@ static int minix_rename(struct mnt_idmap *idmap,
                new_de = minix_find_entry(new_dentry, &new_folio);
                if (!new_de)
                        goto out_dir;
-               err = minix_set_link(new_de, &new_folio->page, old_inode);
+               err = minix_set_link(new_de, new_folio, old_inode);
                folio_release_kmap(new_folio, new_de);
                if (err)
                        goto out_dir;
@@ -235,13 +235,13 @@ static int minix_rename(struct mnt_idmap *idmap,
        mark_inode_dirty(old_inode);
 
        if (dir_de) {
-               err = minix_set_link(dir_de, dir_page, new_dir);
+               err = minix_set_link(dir_de, dir_folio, new_dir);
                if (!err)
                        inode_dec_link_count(old_dir);
        }
 out_dir:
        if (dir_de)
-               unmap_and_put_page(dir_page, dir_de);
+               folio_release_kmap(dir_folio, dir_de);
 out_old:
        folio_release_kmap(old_folio, old_de);
 out: