erofs: clean up erofs_iget()

isdir indicated REQ_META|REQ_PRIO which no longer works now.
Get rid of isdir entirely.

Link: https://lore.kernel.org/r/20220927063607.54832-2-hsiangkao@linux.alibaba.com
Reviewed-by: Yue Hu <huyue2@coolpad.com>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>

diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
index 16cf9a28355742b971688e71fa3b7720d2f7193d..ad2a82f2eb4cdd0084ef659d1f6522a8a5cc2258 100644 (file)
--- a/fs/erofs/inode.c
+++ b/fs/erofs/inode.c
@@ -241,7 +241,7 @@ static int erofs_fill_symlink(struct inode *inode, void *kaddr,
        return 0;
 }
 
-static int erofs_fill_inode(struct inode *inode, int isdir)
+static int erofs_fill_inode(struct inode *inode)
 {
        struct erofs_inode *vi = EROFS_I(inode);
        struct erofs_buf buf = __EROFS_BUF_INITIALIZER;
@@ -249,7 +249,7 @@ static int erofs_fill_inode(struct inode *inode, int isdir)
        unsigned int ofs;
        int err = 0;
 
-       trace_erofs_fill_inode(inode, isdir);
+       trace_erofs_fill_inode(inode);
 
        /* read inode base data from disk */
        kaddr = erofs_read_inode(&buf, inode, &ofs);
@@ -324,21 +324,13 @@ static int erofs_iget_set_actor(struct inode *inode, void *opaque)
        return 0;
 }
 
-static inline struct inode *erofs_iget_locked(struct super_block *sb,
-                                             erofs_nid_t nid)
+struct inode *erofs_iget(struct super_block *sb, erofs_nid_t nid)
 {
        const unsigned long hashval = erofs_inode_hash(nid);
+       struct inode *inode;
 
-       return iget5_locked(sb, hashval, erofs_ilookup_test_actor,
+       inode = iget5_locked(sb, hashval, erofs_ilookup_test_actor,
                erofs_iget_set_actor, &nid);
-}
-
-struct inode *erofs_iget(struct super_block *sb,
-                        erofs_nid_t nid,
-                        bool isdir)
-{
-       struct inode *inode = erofs_iget_locked(sb, nid);
-
        if (!inode)
                return ERR_PTR(-ENOMEM);
 
@@ -348,10 +340,10 @@ struct inode *erofs_iget(struct super_block *sb,
 
                vi->nid = nid;
 
-               err = erofs_fill_inode(inode, isdir);
-               if (!err)
+               err = erofs_fill_inode(inode);
+               if (!err) {
                        unlock_new_inode(inode);
-               else {
+               } else {
                        iget_failed(inode);
                        inode = ERR_PTR(err);
                }

diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index 0318530bc78a4dc5ed102f4ebec1ad404e15a9e8..1701df48c4464977d8e0524024ce42ff55985914 100644 (file)
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -492,7 +492,7 @@ extern const struct inode_operations erofs_generic_iops;
 extern const struct inode_operations erofs_symlink_iops;
 extern const struct inode_operations erofs_fast_symlink_iops;
 
-struct inode *erofs_iget(struct super_block *sb, erofs_nid_t nid, bool dir);
+struct inode *erofs_iget(struct super_block *sb, erofs_nid_t nid);
 int erofs_getattr(struct user_namespace *mnt_userns, const struct path *path,
                  struct kstat *stat, u32 request_mask,
                  unsigned int query_flags);

diff --git a/fs/erofs/namei.c b/fs/erofs/namei.c
index afbb80d4e2f115a118f5cc4c2815c04f3c614c75..0dc34721080c7f5b312f92d4e1cc3dde6ecb98cc 100644 (file)
--- a/fs/erofs/namei.c
+++ b/fs/erofs/namei.c
@@ -219,7 +219,7 @@ static struct dentry *erofs_lookup(struct inode *dir, struct dentry *dentry,
        } else {
                erofs_dbg("%s, %pd (nid %llu) found, d_type %u", __func__,
                          dentry, nid, d_type);
-               inode = erofs_iget(dir->i_sb, nid, d_type == FT_DIR);
+               inode = erofs_iget(dir->i_sb, nid);
        }
        return d_splice_alias(inode, dentry);
 }

diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 8040534ae5c054256b560b0e464f056509aea71c..2cf96ce1c32eed444fbf89f4aa90e4f79fbee42c 100644 (file)
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -385,7 +385,7 @@ static int erofs_read_superblock(struct super_block *sb)
        sbi->packed_inode = NULL;
        if (erofs_sb_has_fragments(sbi) && dsb->packed_nid) {
                sbi->packed_inode =
-                       erofs_iget(sb, le64_to_cpu(dsb->packed_nid), false);
+                       erofs_iget(sb, le64_to_cpu(dsb->packed_nid));
                if (IS_ERR(sbi->packed_inode)) {
                        ret = PTR_ERR(sbi->packed_inode);
                        goto out;
@@ -668,7 +668,7 @@ static int erofs_init_managed_cache(struct super_block *sb) { return 0; }
 static struct inode *erofs_nfs_get_inode(struct super_block *sb,
                                         u64 ino, u32 generation)
 {
-       return erofs_iget(sb, ino, false);
+       return erofs_iget(sb, ino);
 }
 
 static struct dentry *erofs_fh_to_dentry(struct super_block *sb,
@@ -694,7 +694,7 @@ static struct dentry *erofs_get_parent(struct dentry *child)
        err = erofs_namei(d_inode(child), &dotdot_name, &nid, &d_type);
        if (err)
                return ERR_PTR(err);
-       return d_obtain_alias(erofs_iget(child->d_sb, nid, d_type == FT_DIR));
+       return d_obtain_alias(erofs_iget(child->d_sb, nid));
 }
 
 static const struct export_operations erofs_export_ops = {
@@ -782,7 +782,7 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
 #endif
 
        /* get the root inode */
-       inode = erofs_iget(sb, ROOT_NID(sbi), true);
+       inode = erofs_iget(sb, ROOT_NID(sbi));
        if (IS_ERR(inode))
                return PTR_ERR(inode);
 

diff --git a/include/trace/events/erofs.h b/include/trace/events/erofs.h
index 57de057bd503a6dcc6d995dfa11af98ea43862d6..4f4c44ea3a655293c4b67e1fb19a54e32ccff15c 100644 (file)
--- a/include/trace/events/erofs.h
+++ b/include/trace/events/erofs.h
@@ -53,15 +53,14 @@ TRACE_EVENT(erofs_lookup,
 );
 
 TRACE_EVENT(erofs_fill_inode,
-       TP_PROTO(struct inode *inode, int isdir),
-       TP_ARGS(inode, isdir),
+       TP_PROTO(struct inode *inode),
+       TP_ARGS(inode),
 
        TP_STRUCT__entry(
                __field(dev_t,          dev     )
                __field(erofs_nid_t,    nid     )
                __field(erofs_blk_t,    blkaddr )
                __field(unsigned int,   ofs     )
-               __field(int,            isdir   )
        ),
 
        TP_fast_assign(
@@ -69,13 +68,11 @@ TRACE_EVENT(erofs_fill_inode,
                __entry->nid            = EROFS_I(inode)->nid;
                __entry->blkaddr        = erofs_blknr(iloc(EROFS_I_SB(inode), __entry->nid));
                __entry->ofs            = erofs_blkoff(iloc(EROFS_I_SB(inode), __entry->nid));
-               __entry->isdir          = isdir;
        ),
 
-       TP_printk("dev = (%d,%d), nid = %llu, blkaddr %u ofs %u, isdir %d",
+       TP_printk("dev = (%d,%d), nid = %llu, blkaddr %u ofs %u",
                  show_dev_nid(__entry),
-                 __entry->blkaddr, __entry->ofs,
-                 __entry->isdir)
+                 __entry->blkaddr, __entry->ofs)
 );
 
 TRACE_EVENT(erofs_readpage,