Patchwork [1/2] UBIFS: fix debugging messages

login
register
mail settings
Submitter Artem Bityutskiy
Date Jan. 10, 2012, 5:48 p.m.
Message ID <1326217722-20707-1-git-send-email-dedekind1@gmail.com>
Download mbox | patch
Permalink /patch/135273/
State New
Headers show

Comments

Artem Bityutskiy - Jan. 10, 2012, 5:48 p.m.
From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

Patch 56e46742e846e4de167dde0e1e1071ace1c882a5 broke UBIFS debugging messages:
before that commit when UBIFS debugging was enabled, users saw few useful
debugging messages after mount. However, that patch turned 'dbg_msg()' into
'pr_debug()', so to enable the debugging messages users have to enable them
first via /sys/kernel/debug/dynamic_debug/control, which is very impractical.

This commit makes 'dbg_msg()' to use 'printk()' instead of 'pr_debug()', just
as it was before the breakage.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: stable@kernel.org [3.0+]
---
 fs/ubifs/debug.h |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

Patch

diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h
index 8d9c468..d36fe4e 100644
--- a/fs/ubifs/debug.h
+++ b/fs/ubifs/debug.h
@@ -190,7 +190,13 @@  extern spinlock_t dbg_lock;
 } while (0)
 
 /* Just a debugging messages not related to any specific UBIFS subsystem */
-#define dbg_msg(fmt, ...)   ubifs_dbg_msg("msg", fmt, ##__VA_ARGS__)
+#define dbg_msg(fmt, ...) do {                                                \
+	spin_lock(&dbg_lock);                                                 \
+	printk(KERN_DEBUG "UBIFS DBG (pid %d): %s: " fmt "\n", current->pid,  \
+	       __func__, ##__VA_ARGS__);                                      \
+	spin_unlock(&dbg_lock);                                               \
+} while (0)
+
 /* General messages */
 #define dbg_gen(fmt, ...)   ubifs_dbg_msg("gen", fmt, ##__VA_ARGS__)
 /* Additional journal messages */