mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
189ce92b4c
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
From 400fba6cfdfd168d550113f665c3b168cf9214cf Mon Sep 17 00:00:00 2001
|
|
From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
|
|
Date: Wed, 11 Jan 2012 15:13:27 +0200
|
|
Subject: [PATCH 056/129] UBIFS: make debugging messages light again
|
|
|
|
commit 1f5d78dc4823a85f112aaa2d0f17624f8c2a6c52 upstream.
|
|
|
|
We switch to dynamic debugging in commit
|
|
56e46742e846e4de167dde0e1e1071ace1c882a5 but did not take into account that
|
|
now we do not control anymore whether a specific message is enabled or not.
|
|
So now we lock the "dbg_lock" and release it in every debugging macro, which
|
|
make them not so light-weight.
|
|
|
|
This commit removes the "dbg_lock" protection from the debugging macros to
|
|
fix the issue.
|
|
|
|
The downside is that now our DBGKEY() stuff is broken, but this is not
|
|
critical at all and will be fixed later.
|
|
|
|
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
---
|
|
fs/ubifs/debug.h | 12 +++++-------
|
|
1 file changed, 5 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h
|
|
index 3f65829..c9d2941 100644
|
|
--- a/fs/ubifs/debug.h
|
|
+++ b/fs/ubifs/debug.h
|
|
@@ -175,19 +175,17 @@ const char *dbg_key_str1(const struct ubifs_info *c,
|
|
const union ubifs_key *key);
|
|
|
|
/*
|
|
- * DBGKEY macros require @dbg_lock to be held, which it is in the dbg message
|
|
- * macros.
|
|
+ * TODO: these macros are now broken because there is no locking around them
|
|
+ * and we use a global buffer for the key string. This means that in case of
|
|
+ * concurrent execution we will end up with incorrect and messy key strings.
|
|
*/
|
|
#define DBGKEY(key) dbg_key_str0(c, (key))
|
|
#define DBGKEY1(key) dbg_key_str1(c, (key))
|
|
|
|
extern spinlock_t dbg_lock;
|
|
|
|
-#define ubifs_dbg_msg(type, fmt, ...) do { \
|
|
- spin_lock(&dbg_lock); \
|
|
- pr_debug("UBIFS DBG " type ": " fmt "\n", ##__VA_ARGS__); \
|
|
- spin_unlock(&dbg_lock); \
|
|
-} while (0)
|
|
+#define ubifs_dbg_msg(type, fmt, ...) \
|
|
+ pr_debug("UBIFS DBG " type ": " fmt "\n", ##__VA_ARGS__)
|
|
|
|
/* Just a debugging messages not related to any specific UBIFS subsystem */
|
|
#define dbg_msg(fmt, ...) \
|
|
--
|
|
1.7.9.5
|
|
|