From 1eb0c042240b668f2e7f1e900b549ea9675af07a Mon Sep 17 00:00:00 2001 From: "Jose R. Santos" Date: Tue, 16 Oct 2007 18:38:25 -0400 Subject: [PATCH] --- yaml --- r: 71075 b: refs/heads/master c: 6f38c74f5a01c7bccf58f9d7ee47ea24fb45752f h: refs/heads/master i: 71073: b4a6bf738710efaa59311af8f7ebfbe9f3621d03 71071: af8ce6a9d7243d8c2e4a365b6c080dac4359f99a v: v3 --- [refs] | 2 +- trunk/fs/jbd2/journal.c | 20 ++++++-------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 5c468d17b70e..549cee23d030 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7fa2baf8e2a6c0eb0a21f75e919c226179e8ff4 +refs/heads/master: 6f38c74f5a01c7bccf58f9d7ee47ea24fb45752f diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c index ff07bff88cf9..6ddc5531587c 100644 --- a/trunk/fs/jbd2/journal.c +++ b/trunk/fs/jbd2/journal.c @@ -1864,16 +1864,14 @@ void jbd2_journal_put_journal_head(struct journal_head *jh) /* * debugfs tunables */ -#if defined(CONFIG_JBD2_DEBUG) -u8 jbd2_journal_enable_debug; +#ifdef CONFIG_JBD2_DEBUG +u8 jbd2_journal_enable_debug __read_mostly; EXPORT_SYMBOL(jbd2_journal_enable_debug); -#endif - -#if defined(CONFIG_JBD2_DEBUG) && defined(CONFIG_DEBUG_FS) #define JBD2_DEBUG_NAME "jbd2-debug" -struct dentry *jbd2_debugfs_dir, *jbd2_debug; +static struct dentry *jbd2_debugfs_dir; +static struct dentry *jbd2_debug; static void __init jbd2_create_debugfs_entry(void) { @@ -1886,24 +1884,18 @@ static void __init jbd2_create_debugfs_entry(void) static void __exit jbd2_remove_debugfs_entry(void) { - if (jbd2_debug) - debugfs_remove(jbd2_debug); - if (jbd2_debugfs_dir) - debugfs_remove(jbd2_debugfs_dir); + debugfs_remove(jbd2_debug); + debugfs_remove(jbd2_debugfs_dir); } #else static void __init jbd2_create_debugfs_entry(void) { - do { - } while (0); } static void __exit jbd2_remove_debugfs_entry(void) { - do { - } while (0); } #endif