[Ocfs2-devel] [PATCH 2/4] ocfs2: add mlog ML_WARNING support
Heming Zhao
heming.zhao at suse.com
Sat Jul 30 01:14:09 UTC 2022
This commit gives new message type for ocfs2.
Signed-off-by: Heming Zhao <heming.zhao at suse.com>
---
fs/ocfs2/cluster/masklog.c | 3 +++
fs/ocfs2/cluster/masklog.h | 9 +++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index 563881ddbf00..bac3488e8002 100644
--- a/fs/ocfs2/cluster/masklog.c
+++ b/fs/ocfs2/cluster/masklog.c
@@ -63,6 +63,9 @@ void __mlog_printk(const u64 *mask, const char *func, int line,
if (*mask & ML_ERROR) {
level = KERN_ERR;
prefix = "ERROR: ";
+ } else if (*mask & ML_WARNING) {
+ level = KERN_WARNING;
+ prefix = "WARNING: ";
} else if (*mask & ML_NOTICE) {
level = KERN_NOTICE;
} else {
diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h
index b73fc42e46ff..d0bc4fe8cf3d 100644
--- a/fs/ocfs2/cluster/masklog.h
+++ b/fs/ocfs2/cluster/masklog.h
@@ -86,10 +86,11 @@
/* bits that are infrequently given and frequently matched in the high word */
#define ML_ERROR 0x1000000000000000ULL /* sent to KERN_ERR */
-#define ML_NOTICE 0x2000000000000000ULL /* setn to KERN_NOTICE */
-#define ML_KTHREAD 0x4000000000000000ULL /* kernel thread activity */
+#define ML_NOTICE 0x2000000000000000ULL /* sent to KERN_NOTICE */
+#define ML_WARNING 0x4000000000000000ULL /* sent to KERN_WARNING */
+#define ML_KTHREAD 0x8000000000000000ULL /* kernel thread activity */
-#define MLOG_INITIAL_AND_MASK (ML_ERROR|ML_NOTICE)
+#define MLOG_INITIAL_AND_MASK (ML_ERROR|ML_WARNING|ML_NOTICE)
#ifndef MLOG_MASK_PREFIX
#define MLOG_MASK_PREFIX 0
#endif
@@ -102,7 +103,7 @@
#if defined(CONFIG_OCFS2_DEBUG_MASKLOG)
#define ML_ALLOWED_BITS ~0
#else
-#define ML_ALLOWED_BITS (ML_ERROR|ML_NOTICE)
+#define ML_ALLOWED_BITS (ML_ERROR|ML_WARNING|ML_NOTICE)
#endif
#define MLOG_MAX_BITS 64
--
2.37.1
More information about the Ocfs2-devel
mailing list