erofs: sunset erofs_dbg()

commit 10656f9ca60ed85f4cfc06bcbe1f240ee310fa8c upstream.

Such debug messages are rarely used now.  Let's get rid of these,
and revert locally if they are needed for debugging.

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20230414083027.12307-1-hsiangkao@linux.alibaba.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
index 7dcf350b9fef9ed73b185822311fae53e4a3384e..3cbef6318b7b1abd08246161b3c63e0d379c6d19 100644 (file)
--- a/fs/erofs/inode.c
+++ b/fs/erofs/inode.c
@@ -26,9 +26,6 @@ static void *erofs_read_inode(struct erofs_buf *buf,
        blkaddr = erofs_blknr(sb, inode_loc);
        *ofs = erofs_blkoff(sb, inode_loc);
 
-       erofs_dbg("%s, reading inode nid %llu at %u of blkaddr %u",
-                 __func__, vi->nid, *ofs, blkaddr);
-
        kaddr = erofs_read_metabuf(buf, sb, blkaddr, EROFS_KMAP);
        if (IS_ERR(kaddr)) {
                erofs_err(sb, "failed to get inode (nid: %llu) page, err %ld",

diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index d7cd1e619d46f2ddd52a052c07109bf834a60a93..1269709328056f9282b8cc21a5cedf9c386ee790 100644 (file)
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -32,10 +32,8 @@ __printf(3, 4) void _erofs_info(struct super_block *sb,
 #define erofs_info(sb, fmt, ...) \
        _erofs_info(sb, __func__, fmt "\n", ##__VA_ARGS__)
 #ifdef CONFIG_EROFS_FS_DEBUG
-#define erofs_dbg(x, ...)       pr_debug(x "\n", ##__VA_ARGS__)
 #define DBG_BUGON               BUG_ON
 #else
-#define erofs_dbg(x, ...)       ((void)0)
 #define DBG_BUGON(x)            ((void)(x))
 #endif /* !CONFIG_EROFS_FS_DEBUG */
 

diff --git a/fs/erofs/namei.c b/fs/erofs/namei.c
index 8332428b780cd3ff221b6d458faa55255a5482fc..c0d5ffb62420a316502a357417663fe755d62cb2 100644 (file)
--- a/fs/erofs/namei.c
+++ b/fs/erofs/namei.c
@@ -203,16 +203,13 @@ static struct dentry *erofs_lookup(struct inode *dir, struct dentry *dentry,
 
        err = erofs_namei(dir, &dentry->d_name, &nid, &d_type);
 
-       if (err == -ENOENT) {
+       if (err == -ENOENT)
                /* negative dentry */
                inode = NULL;
-       } else if (err) {
+       else if (err)
                inode = ERR_PTR(err);
-       } else {
-               erofs_dbg("%s, %pd (nid %llu) found, d_type %u", __func__,
-                         dentry, nid, d_type);
+       else
                inode = erofs_iget(dir->i_sb, nid);
-       }
        return d_splice_alias(inode, dentry);
 }
 

diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index 32ca6d3e373abb69b1c7cf22ec1156562db48be5..5c0f855ab18dd6b04baf2d1b76281d2a4e174569 100644 (file)
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -818,8 +818,6 @@ repeat:
 
        if (offset + cur < map->m_la ||
            offset + cur >= map->m_la + map->m_llen) {
-               erofs_dbg("out-of-range map @ pos %llu", offset + cur);
-
                if (z_erofs_collector_end(fe))
                        fe->backmost = false;
                map->m_la = offset + cur;
@@ -935,9 +933,6 @@ out:
        if (err)
                z_erofs_page_mark_eio(page);
        z_erofs_onlinepage_endio(page);
-
-       erofs_dbg("%s, finish page: %pK spiltted: %u map->m_llen %llu",
-                 __func__, page, spiltted, map->m_llen);
        return err;
 }
 

diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c
index 2cd70cf4c8b27085fc13c1594d644c0f74810a4b..d2d7fe826091f63cd800fbcda10e0149d2be9926 100644 (file)
--- a/fs/erofs/zmap.c
+++ b/fs/erofs/zmap.c
@@ -603,9 +603,6 @@ static int z_erofs_do_map_blocks(struct inode *inode,
 
 unmap_out:
        erofs_unmap_metabuf(&m.map->buf);
-       erofs_dbg("%s, m_la %llu m_pa %llu m_llen %llu m_plen %llu m_flags 0%o",
-                 __func__, map->m_la, map->m_pa,
-                 map->m_llen, map->m_plen, map->m_flags);
        return err;
 }