ext2: Convert ext2_unlink() and ext2_rename() to use folios

[linux-2.6-microblaze.git] / fs / ext2 / namei.c

diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index 0595170..65f702b 100644 (file)
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -273,21 +273,21 @@ static int ext2_unlink(struct inode *dir, struct dentry *dentry)
 {
        struct inode *inode = d_inode(dentry);
        struct ext2_dir_entry_2 *de;
-       struct page *page;
+       struct folio *folio;
        int err;
 
        err = dquot_initialize(dir);
        if (err)
                goto out;
 
-       de = ext2_find_entry(dir, &dentry->d_name, &page);
+       de = ext2_find_entry(dir, &dentry->d_name, &folio);
        if (IS_ERR(de)) {
                err = PTR_ERR(de);
                goto out;
        }
 
-       err = ext2_delete_entry(de, page);
-       ext2_put_page(page, de);
+       err = ext2_delete_entry(de, folio);
+       folio_release_kmap(folio, de);
        if (err)
                goto out;
 
@@ -321,9 +321,9 @@ static int ext2_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 ext2_dir_entry_2 * dir_de = NULL;
-       struct page * old_page;
+       struct folio * old_folio;
        struct ext2_dir_entry_2 * old_de;
        int err;
 
@@ -338,19 +338,19 @@ static int ext2_rename (struct mnt_idmap * idmap,
        if (err)
                return err;
 
-       old_de = ext2_find_entry(old_dir, &old_dentry->d_name, &old_page);
+       old_de = ext2_find_entry(old_dir, &old_dentry->d_name, &old_folio);
        if (IS_ERR(old_de))
                return PTR_ERR(old_de);
 
        if (S_ISDIR(old_inode->i_mode)) {
                err = -EIO;
-               dir_de = ext2_dotdot(old_inode, &dir_page);
+               dir_de = ext2_dotdot(old_inode, &dir_folio);
                if (!dir_de)
                        goto out_old;
        }
 
        if (new_inode) {
-               struct page *new_page;
+               struct folio *new_folio;
                struct ext2_dir_entry_2 *new_de;
 
                err = -ENOTEMPTY;
@@ -358,13 +358,13 @@ static int ext2_rename (struct mnt_idmap * idmap,
                        goto out_dir;
 
                new_de = ext2_find_entry(new_dir, &new_dentry->d_name,
-                                        &new_page);
+                                        &new_folio);
                if (IS_ERR(new_de)) {
                        err = PTR_ERR(new_de);
                        goto out_dir;
                }
-               err = ext2_set_link(new_dir, new_de, new_page, old_inode, true);
-               ext2_put_page(new_page, new_de);
+               err = ext2_set_link(new_dir, new_de, new_folio, old_inode, true);
+               folio_release_kmap(new_folio, new_de);
                if (err)
                        goto out_dir;
                inode_set_ctime_current(new_inode);
@@ -386,19 +386,19 @@ static int ext2_rename (struct mnt_idmap * idmap,
        inode_set_ctime_current(old_inode);
        mark_inode_dirty(old_inode);
 
-       err = ext2_delete_entry(old_de, old_page);
+       err = ext2_delete_entry(old_de, old_folio);
        if (!err && dir_de) {
                if (old_dir != new_dir)
-                       err = ext2_set_link(old_inode, dir_de, dir_page,
+                       err = ext2_set_link(old_inode, dir_de, dir_folio,
                                            new_dir, false);
 
                inode_dec_link_count(old_dir);
        }
 out_dir:
        if (dir_de)
-               ext2_put_page(dir_page, dir_de);
+               folio_release_kmap(dir_folio, dir_de);
 out_old:
-       ext2_put_page(old_page, old_de);
+       folio_release_kmap(old_folio, old_de);
        return err;
 }