Skip to content

Commit 10656f9

Browse files
committed
erofs: sunset erofs_dbg()
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
1 parent 1b3567a commit 10656f9

5 files changed

Lines changed: 3 additions & 19 deletions

File tree

fs/erofs/inode.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ static void *erofs_read_inode(struct erofs_buf *buf,
2626
blkaddr = erofs_blknr(sb, inode_loc);
2727
*ofs = erofs_blkoff(sb, inode_loc);
2828

29-
erofs_dbg("%s, reading inode nid %llu at %u of blkaddr %u",
30-
__func__, vi->nid, *ofs, blkaddr);
31-
3229
kaddr = erofs_read_metabuf(buf, sb, blkaddr, EROFS_KMAP);
3330
if (IS_ERR(kaddr)) {
3431
erofs_err(sb, "failed to get inode (nid: %llu) page, err %ld",

fs/erofs/internal.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ __printf(3, 4) void _erofs_info(struct super_block *sb,
3131
#define erofs_info(sb, fmt, ...) \
3232
_erofs_info(sb, __func__, fmt "\n", ##__VA_ARGS__)
3333
#ifdef CONFIG_EROFS_FS_DEBUG
34-
#define erofs_dbg(x, ...) pr_debug(x "\n", ##__VA_ARGS__)
3534
#define DBG_BUGON BUG_ON
3635
#else
37-
#define erofs_dbg(x, ...) ((void)0)
3836
#define DBG_BUGON(x) ((void)(x))
3937
#endif /* !CONFIG_EROFS_FS_DEBUG */
4038

fs/erofs/namei.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,16 +205,13 @@ static struct dentry *erofs_lookup(struct inode *dir, struct dentry *dentry,
205205

206206
err = erofs_namei(dir, &dentry->d_name, &nid, &d_type);
207207

208-
if (err == -ENOENT) {
208+
if (err == -ENOENT)
209209
/* negative dentry */
210210
inode = NULL;
211-
} else if (err) {
211+
else if (err)
212212
inode = ERR_PTR(err);
213-
} else {
214-
erofs_dbg("%s, %pd (nid %llu) found, d_type %u", __func__,
215-
dentry, nid, d_type);
213+
else
216214
inode = erofs_iget(dir->i_sb, nid);
217-
}
218215
return d_splice_alias(inode, dentry);
219216
}
220217

fs/erofs/zdata.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -979,8 +979,6 @@ static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,
979979

980980
if (offset + cur < map->m_la ||
981981
offset + cur >= map->m_la + map->m_llen) {
982-
erofs_dbg("out-of-range map @ pos %llu", offset + cur);
983-
984982
if (z_erofs_collector_end(fe))
985983
fe->backmost = false;
986984
map->m_la = offset + cur;
@@ -1105,9 +1103,6 @@ static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,
11051103
if (err)
11061104
z_erofs_page_mark_eio(page);
11071105
z_erofs_onlinepage_endio(page);
1108-
1109-
erofs_dbg("%s, finish page: %pK spiltted: %u map->m_llen %llu",
1110-
__func__, page, spiltted, map->m_llen);
11111106
return err;
11121107
}
11131108

fs/erofs/zmap.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -585,9 +585,6 @@ static int z_erofs_do_map_blocks(struct inode *inode,
585585

586586
unmap_out:
587587
erofs_unmap_metabuf(&m.map->buf);
588-
erofs_dbg("%s, m_la %llu m_pa %llu m_llen %llu m_plen %llu m_flags 0%o",
589-
__func__, map->m_la, map->m_pa,
590-
map->m_llen, map->m_plen, map->m_flags);
591588
return err;
592589
}
593590

0 commit comments

Comments
 (0)