summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-01-10 19:32:30 +0200
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-01-11 18:44:53 +0200
commitd34315da9146253351146140ea4b277193ee5e5f (patch)
tree79ae0d18b0219ce827d694906fb6e4057b308260
parent1f5d78dc4823a85f112aaa2d0f17624f8c2a6c52 (diff)
downloadop-kernel-dev-d34315da9146253351146140ea4b277193ee5e5f.zip
op-kernel-dev-d34315da9146253351146140ea4b277193ee5e5f.tar.gz
UBIFS: fix debugging messages
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+]
-rw-r--r--fs/ubifs/debug.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h
index 164fd48..c9d2941 100644
--- a/fs/ubifs/debug.h
+++ b/fs/ubifs/debug.h
@@ -188,7 +188,10 @@ extern spinlock_t dbg_lock;
pr_debug("UBIFS DBG " type ": " fmt "\n", ##__VA_ARGS__)
/* 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, ...) \
+ printk(KERN_DEBUG "UBIFS DBG (pid %d): %s: " fmt "\n", current->pid, \
+ __func__, ##__VA_ARGS__)
+
/* General messages */
#define dbg_gen(fmt, ...) ubifs_dbg_msg("gen", fmt, ##__VA_ARGS__)
/* Additional journal messages */
OpenPOWER on IntegriCloud