JBD2: debug code cleanup.
PATCH 1/1 JBD2: debug code cleanup.
From: Jose R. Santos <[email protected]>
JBD2: debug code cleanup.
Mostly stolen from akpm's JBD cleanup patch.
- use #ifdef foo' instead of #if defined(foo)'
- Make journal_enable_debug __read_mostly just for the heck of it
- Make jbd_debugfs_dir and jbd_debug static
- debugfs_remove(NULL) is legal: remove unneeded tests
- remove unnecessary empty loops
Signed-off-by Jose R. Santos <[email protected]>
--
fs/jbd2/journal.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-)
fs/jbd2/journal.c +6 -14
@@ -1953,16 +1953,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 ) {
@@ -1975,24 +1973,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