| From 1f5d78dc4823a85f112aaa2d0f17624f8c2a6c52 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: UBIFS: make debugging messages light again |
| |
| From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> |
| |
| 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(-) |
| |
| --- a/fs/ubifs/debug.h |
| +++ b/fs/ubifs/debug.h |
| @@ -121,17 +121,15 @@ const char *dbg_key_str1(const struct ub |
| 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)) |
| |
| -#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, ...) \ |
