erofs: clean up unnecessary code and comments

Some conditional macros and comments are useless.

Link: https://lore.kernel.org/r/20220927063607.54832-1-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/internal.h b/fs/erofs/internal.h
index a6333c283e3d2f958c8550fbae93b5496be36bb0..0318530bc78a4dc5ed102f4ebec1ad404e15a9e8 100644 (file)
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -196,7 +196,6 @@ enum {
        EROFS_ZIP_CACHE_READAROUND
 };
 
-#ifdef CONFIG_EROFS_FS_ZIP
 #define EROFS_LOCKED_MAGIC     (INT_MIN | 0xE0F510CCL)
 
 /* basic unit of the workstation of a super_block */
@@ -236,7 +235,6 @@ static inline int erofs_wait_on_workgroup_freezed(struct erofs_workgroup *grp)
        return atomic_cond_read_relaxed(&grp->refcount,
                                        VAL != EROFS_LOCKED_MAGIC);
 }
-#endif /* !CONFIG_EROFS_FS_ZIP */
 
 /* we strictly follow PAGE_SIZE and no buffer head yet */
 #define LOG_BLOCK_SIZE         PAGE_SHIFT

diff --git a/fs/erofs/namei.c b/fs/erofs/namei.c
index fd75506799c4037a6743c4e89cb0321d76754c72..afbb80d4e2f115a118f5cc4c2815c04f3c614c75 100644 (file)
--- a/fs/erofs/namei.c
+++ b/fs/erofs/namei.c
@@ -185,7 +185,6 @@ int erofs_namei(struct inode *dir, const struct qstr *name, erofs_nid_t *nid,
        if (IS_ERR(de))
                return PTR_ERR(de);
 
-       /* the target page has been mapped */
        if (ndirents)
                de = find_target_dirent(&qn, (u8 *)de, EROFS_BLKSIZ, ndirents);
 
@@ -197,9 +196,7 @@ int erofs_namei(struct inode *dir, const struct qstr *name, erofs_nid_t *nid,
        return PTR_ERR_OR_ZERO(de);
 }
 
-/* NOTE: i_mutex is already held by vfs */
-static struct dentry *erofs_lookup(struct inode *dir,
-                                  struct dentry *dentry,
+static struct dentry *erofs_lookup(struct inode *dir, struct dentry *dentry,
                                   unsigned int flags)
 {
        int err;
@@ -207,17 +204,11 @@ static struct dentry *erofs_lookup(struct inode *dir,
        unsigned int d_type;
        struct inode *inode;
 
-       DBG_BUGON(!d_really_is_negative(dentry));
-       /* dentry must be unhashed in lookup, no need to worry about */
-       DBG_BUGON(!d_unhashed(dentry));
-
        trace_erofs_lookup(dir, dentry, flags);
 
-       /* file name exceeds fs limit */
        if (dentry->d_name.len > EROFS_NAME_LEN)
                return ERR_PTR(-ENAMETOOLONG);
 
-       /* false uninitialized warnings on gcc 4.8.x */
        err = erofs_namei(dir, &dentry->d_name, &nid, &d_type);
 
        if (err == -ENOENT) {

diff --git a/fs/erofs/xattr.h b/fs/erofs/xattr.h
index 332462c59f115916d6bc7109774897bf5a038bcf..0a43c9ee9f8f3ba8d7cf999d90d39f435c78cfbf 100644 (file)
--- a/fs/erofs/xattr.h
+++ b/fs/erofs/xattr.h
@@ -39,9 +39,7 @@ static inline unsigned int xattrblock_offset(struct erofs_sb_info *sbi,
 #ifdef CONFIG_EROFS_FS_XATTR
 extern const struct xattr_handler erofs_xattr_user_handler;
 extern const struct xattr_handler erofs_xattr_trusted_handler;
-#ifdef CONFIG_EROFS_FS_SECURITY
 extern const struct xattr_handler erofs_xattr_security_handler;
-#endif
 
 static inline const struct xattr_handler *erofs_xattr_handler(unsigned int idx)
 {

diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c
index 4cecd32b87c6dade23e17afbda87278256b0b7df..44c27ef39c436d2362f530798d259de9c7ec499e 100644 (file)
--- a/fs/erofs/zmap.c
+++ b/fs/erofs/zmap.c
@@ -731,8 +731,7 @@ out:
        return err;
 }
 
-int z_erofs_map_blocks_iter(struct inode *inode,
-                           struct erofs_map_blocks *map,
+int z_erofs_map_blocks_iter(struct inode *inode, struct erofs_map_blocks *map,
                            int flags)
 {
        struct erofs_inode *const vi = EROFS_I(inode);