ufs: Convert ufs_find_entry() to take a folio

This matches ext2 and pushes the use of folios out by one layer.

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/ufs/dir.c b/fs/ufs/dir.c
index 287cab597cc11071f54a5e62c66d10316c9cceda..fb56a00b622ca3a18c62394f0cf6f2e695a33329 100644 (file)
--- a/fs/ufs/dir.c
+++ b/fs/ufs/dir.c
@@ -76,12 +76,12 @@ ino_t ufs_inode_by_name(struct inode *dir, const struct qstr *qstr)
 {
        ino_t res = 0;
        struct ufs_dir_entry *de;
-       struct page *page;
+       struct folio *folio;
        
-       de = ufs_find_entry(dir, qstr, &page);
+       de = ufs_find_entry(dir, qstr, &folio);
        if (de) {
                res = fs32_to_cpu(dir->i_sb, de->d_ino);
-               ufs_put_page(page);
+               ufs_put_page(&folio->page);
        }
        return res;
 }
@@ -255,7 +255,7 @@ struct ufs_dir_entry *ufs_dotdot(struct inode *dir, struct page **p)
  * Entry is guaranteed to be valid.
  */
 struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr *qstr,
-                                    struct page **res_page)
+                                    struct folio **foliop)
 {
        struct super_block *sb = dir->i_sb;
        const unsigned char *name = qstr->name;
@@ -263,7 +263,6 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr *qstr,
        unsigned reclen = UFS_DIR_REC_LEN(namelen);
        unsigned long start, n;
        unsigned long npages = dir_pages(dir);
-       struct folio *folio;
        struct ufs_inode_info *ui = UFS_I(dir);
        struct ufs_dir_entry *de;
 
@@ -272,16 +271,13 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr *qstr,
        if (npages == 0 || namelen > UFS_MAXNAMLEN)
                goto out;
 
-       /* OFFSET_CACHE */
-       *res_page = NULL;
-
        start = ui->i_dir_start_lookup;
 
        if (start >= npages)
                start = 0;
        n = start;
        do {
-               char *kaddr = ufs_get_folio(dir, n, &folio);
+               char *kaddr = ufs_get_folio(dir, n, foliop);
 
                if (!IS_ERR(kaddr)) {
                        de = (struct ufs_dir_entry *)kaddr;
@@ -291,7 +287,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr *qstr,
                                        goto found;
                                de = ufs_next_entry(sb, de);
                        }
-                       ufs_put_page(&folio->page);
+                       ufs_put_page(&(*foliop)->page);
                }
                if (++n >= npages)
                        n = 0;
@@ -300,7 +296,6 @@ out:
        return NULL;
 
 found:
-       *res_page = &folio->page;
        ui->i_dir_start_lookup = n;
        return de;
 }

diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index 9cad294637918195e656aef28e0d7445a89b5ec6..53e9bfad54dfa8e4506d9bd8a2e040d5411970e6 100644 (file)
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -209,14 +209,14 @@ static int ufs_unlink(struct inode *dir, struct dentry *dentry)
 {
        struct inode * inode = d_inode(dentry);
        struct ufs_dir_entry *de;
-       struct page *page;
+       struct folio *folio;
        int err = -ENOENT;
 
-       de = ufs_find_entry(dir, &dentry->d_name, &page);
+       de = ufs_find_entry(dir, &dentry->d_name, &folio);
        if (!de)
                goto out;
 
-       err = ufs_delete_entry(dir, de, page);
+       err = ufs_delete_entry(dir, de, &folio->page);
        if (err)
                goto out;
 
@@ -251,14 +251,14 @@ static int ufs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
        struct inode *new_inode = d_inode(new_dentry);
        struct page *dir_page = NULL;
        struct ufs_dir_entry * dir_de = NULL;
-       struct page *old_page;
+       struct folio *old_folio;
        struct ufs_dir_entry *old_de;
        int err = -ENOENT;
 
        if (flags & ~RENAME_NOREPLACE)
                return -EINVAL;
 
-       old_de = ufs_find_entry(old_dir, &old_dentry->d_name, &old_page);
+       old_de = ufs_find_entry(old_dir, &old_dentry->d_name, &old_folio);
        if (!old_de)
                goto out;
 
@@ -270,7 +270,7 @@ static int ufs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
        }
 
        if (new_inode) {
-               struct page *new_page;
+               struct folio *new_folio;
                struct ufs_dir_entry *new_de;
 
                err = -ENOTEMPTY;
@@ -278,10 +278,10 @@ static int ufs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
                        goto out_dir;
 
                err = -ENOENT;
-               new_de = ufs_find_entry(new_dir, &new_dentry->d_name, &new_page);
+               new_de = ufs_find_entry(new_dir, &new_dentry->d_name, &new_folio);
                if (!new_de)
                        goto out_dir;
-               ufs_set_link(new_dir, new_de, new_page, old_inode, 1);
+               ufs_set_link(new_dir, new_de, &new_folio->page, old_inode, 1);
                inode_set_ctime_current(new_inode);
                if (dir_de)
                        drop_nlink(new_inode);
@@ -300,7 +300,7 @@ static int ufs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
         */
        inode_set_ctime_current(old_inode);
 
-       ufs_delete_entry(old_dir, old_de, old_page);
+       ufs_delete_entry(old_dir, old_de, &old_folio->page);
        mark_inode_dirty(old_inode);
 
        if (dir_de) {
@@ -321,8 +321,8 @@ out_dir:
                put_page(dir_page);
        }
 out_old:
-       kunmap(old_page);
-       put_page(old_page);
+       kunmap(&old_folio->page);
+       folio_put(old_folio);
 out:
        return err;
 }

diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h
index 6b499180643bb947512a11f1196d27218f29ae4a..161fe0bb6fd1572ecd6978017c1984ad8afb05d2 100644 (file)
--- a/fs/ufs/ufs.h
+++ b/fs/ufs/ufs.h
@@ -99,15 +99,17 @@ extern void ufs_put_cylinder (struct super_block *, unsigned);
 
 /* dir.c */
 extern const struct inode_operations ufs_dir_inode_operations;
-extern int ufs_add_link (struct dentry *, struct inode *);
-extern ino_t ufs_inode_by_name(struct inode *, const struct qstr *);
-extern int ufs_make_empty(struct inode *, struct inode *);
-extern struct ufs_dir_entry *ufs_find_entry(struct inode *, const struct qstr *, struct page **);
-extern int ufs_delete_entry(struct inode *, struct ufs_dir_entry *, struct page *);
-extern int ufs_empty_dir (struct inode *);
-extern struct ufs_dir_entry *ufs_dotdot(struct inode *, struct page **);
-extern void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de,
-                        struct page *page, struct inode *inode, bool update_times);
+
+int ufs_add_link(struct dentry *, struct inode *);
+ino_t ufs_inode_by_name(struct inode *, const struct qstr *);
+int ufs_make_empty(struct inode *, struct inode *);
+struct ufs_dir_entry *ufs_find_entry(struct inode *, const struct qstr *,
+               struct folio **);
+int ufs_delete_entry(struct inode *, struct ufs_dir_entry *, struct page *);
+int ufs_empty_dir(struct inode *);
+struct ufs_dir_entry *ufs_dotdot(struct inode *, struct page **);
+void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de,
+               struct page *page, struct inode *inode, bool update_times);
 
 /* file.c */
 extern const struct inode_operations ufs_file_inode_operations;