diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-01-18 09:06:17 -0500 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-02-29 09:10:20 -0500 |
commit | b06283c7df35b5a49ab141ed38e0280821379096 (patch) | |
tree | 9b99a46776ca420887bf73ecbc9bb3041e5f66b6 /fs/ubifs | |
parent | 16c395ca72a79115653892c0724d4928f72520fe (diff) |
UBIFS: make the dbg_lock spinlock static
Remove the usage of the 'dbg_lock' spinlock from 'dbg_err()' and make
it static.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'fs/ubifs')
-rw-r--r-- | fs/ubifs/debug.c | 2 | ||||
-rw-r--r-- | fs/ubifs/debug.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 305062886f17..1934084e2088 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | #ifdef CONFIG_UBIFS_FS_DEBUG | 37 | #ifdef CONFIG_UBIFS_FS_DEBUG |
38 | 38 | ||
39 | DEFINE_SPINLOCK(dbg_lock); | 39 | static DEFINE_SPINLOCK(dbg_lock); |
40 | 40 | ||
41 | static const char *get_key_fmt(int fmt) | 41 | static const char *get_key_fmt(int fmt) |
42 | { | 42 | { |
diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index ad1a6fee6010..9f717655df18 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h | |||
@@ -164,9 +164,7 @@ struct ubifs_global_debug_info { | |||
164 | #define dbg_dump_stack() dump_stack() | 164 | #define dbg_dump_stack() dump_stack() |
165 | 165 | ||
166 | #define dbg_err(fmt, ...) do { \ | 166 | #define dbg_err(fmt, ...) do { \ |
167 | spin_lock(&dbg_lock); \ | ||
168 | ubifs_err(fmt, ##__VA_ARGS__); \ | 167 | ubifs_err(fmt, ##__VA_ARGS__); \ |
169 | spin_unlock(&dbg_lock); \ | ||
170 | } while (0) | 168 | } while (0) |
171 | 169 | ||
172 | #define ubifs_dbg_msg(type, fmt, ...) \ | 170 | #define ubifs_dbg_msg(type, fmt, ...) \ |
@@ -217,7 +215,6 @@ struct ubifs_global_debug_info { | |||
217 | /* Additional recovery messages */ | 215 | /* Additional recovery messages */ |
218 | #define dbg_rcvry(fmt, ...) ubifs_dbg_msg("rcvry", fmt, ##__VA_ARGS__) | 216 | #define dbg_rcvry(fmt, ...) ubifs_dbg_msg("rcvry", fmt, ##__VA_ARGS__) |
219 | 217 | ||
220 | extern spinlock_t dbg_lock; | ||
221 | extern struct ubifs_global_debug_info ubifs_dbg; | 218 | extern struct ubifs_global_debug_info ubifs_dbg; |
222 | 219 | ||
223 | static inline int dbg_is_chk_gen(const struct ubifs_info *c) | 220 | static inline int dbg_is_chk_gen(const struct ubifs_info *c) |