Hi Hao,
Sorry for late response due to my long vacation.
On 2024/10/18 11:35, Gou Hao wrote:
using printk instead of pr_info/err, reduce
redundant code.
Use printk instead of pr_info/err to reduce
redundant code.
Signed-off-by: Gou Hao <gou...@uniontech.com>
---
fs/erofs/internal.h | 9 ++++-----
fs/erofs/super.c | 28 +++++++---------------------
2 files changed, 11 insertions(+), 26 deletions(-)
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index 4efd578d7c62..ae87e855e815 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -24,14 +24,13 @@
#undef pr_fmt
#define pr_fmt(fmt) "erofs: " fmt
-__printf(3, 4) void _erofs_err(struct super_block *sb,
+__printf(3, 4) void _erofs_printk(struct super_block *sb,
const char *function, const char *fmt, ...);
#define erofs_err(sb, fmt, ...) \
- _erofs_err(sb, __func__, fmt "\n", ##__VA_ARGS__)
-__printf(3, 4) void _erofs_info(struct super_block *sb,
- const char *function, const char *fmt, ...);
+ _erofs_printk(sb, __func__, KERN_ERR fmt "\n", ##__VA_ARGS__)
#define erofs_info(sb, fmt, ...) \
- _erofs_info(sb, __func__, fmt "\n", ##__VA_ARGS__)
+ _erofs_printk(sb, __func__, KERN_INFO fmt "\n", ##__VA_ARGS__)
+
#ifdef CONFIG_EROFS_FS_DEBUG
#define DBG_BUGON BUG_ON
#else
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 666873f745da..64c3258ddf9a 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -18,37 +18,23 @@
static struct kmem_cache *erofs_inode_cachep __read_mostly;
-void _erofs_err(struct super_block *sb, const char *func, const char *fmt, ...)
+void _erofs_printk(struct super_block *sb, const char *func, const char *fmt,
...)
{
struct va_format vaf;
va_list args;
+ int level;
va_start(args, fmt);
- vaf.fmt = fmt;
+ level = printk_get_level(fmt);
+ vaf.fmt = printk_skip_level(fmt);
vaf.va = &args;
Let's get rid of `const char *func,` for all cases
since I think it's not very helpful indeed.
Thanks,
Gao Xiang
