From f5a162d1b2903edf92f7374ff6874e79c54e7bf0 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Wed, 18 Jan 2012 16:06:17 +0200 Subject: [PATCH] --- yaml --- r: 294651 b: refs/heads/master c: b06283c7df35b5a49ab141ed38e0280821379096 h: refs/heads/master i: 294649: f78eaffe733edb9727cf9d1b7ff84c25b8bba8a9 294647: 86fd38ca4be3ea186816512552a736aa04aa966e v: v3 --- [refs] | 2 +- trunk/fs/ubifs/debug.c | 2 +- trunk/fs/ubifs/debug.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index df2c264737e3..f441fc91f8c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16c395ca72a79115653892c0724d4928f72520fe +refs/heads/master: b06283c7df35b5a49ab141ed38e0280821379096 diff --git a/trunk/fs/ubifs/debug.c b/trunk/fs/ubifs/debug.c index 305062886f17..1934084e2088 100644 --- a/trunk/fs/ubifs/debug.c +++ b/trunk/fs/ubifs/debug.c @@ -36,7 +36,7 @@ #ifdef CONFIG_UBIFS_FS_DEBUG -DEFINE_SPINLOCK(dbg_lock); +static DEFINE_SPINLOCK(dbg_lock); static const char *get_key_fmt(int fmt) { diff --git a/trunk/fs/ubifs/debug.h b/trunk/fs/ubifs/debug.h index ad1a6fee6010..9f717655df18 100644 --- a/trunk/fs/ubifs/debug.h +++ b/trunk/fs/ubifs/debug.h @@ -164,9 +164,7 @@ struct ubifs_global_debug_info { #define dbg_dump_stack() dump_stack() #define dbg_err(fmt, ...) do { \ - spin_lock(&dbg_lock); \ ubifs_err(fmt, ##__VA_ARGS__); \ - spin_unlock(&dbg_lock); \ } while (0) #define ubifs_dbg_msg(type, fmt, ...) \ @@ -217,7 +215,6 @@ struct ubifs_global_debug_info { /* Additional recovery messages */ #define dbg_rcvry(fmt, ...) ubifs_dbg_msg("rcvry", fmt, ##__VA_ARGS__) -extern spinlock_t dbg_lock; extern struct ubifs_global_debug_info ubifs_dbg; static inline int dbg_is_chk_gen(const struct ubifs_info *c)