diff options
Diffstat (limited to 'fs/jbd2/journal.c')
-rw-r--r-- | fs/jbd2/journal.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index ff07bff88cf9..6ddc5531587c 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c | |||
@@ -1864,16 +1864,14 @@ void jbd2_journal_put_journal_head(struct journal_head *jh) | |||
1864 | /* | 1864 | /* |
1865 | * debugfs tunables | 1865 | * debugfs tunables |
1866 | */ | 1866 | */ |
1867 | #if defined(CONFIG_JBD2_DEBUG) | 1867 | #ifdef CONFIG_JBD2_DEBUG |
1868 | u8 jbd2_journal_enable_debug; | 1868 | u8 jbd2_journal_enable_debug __read_mostly; |
1869 | EXPORT_SYMBOL(jbd2_journal_enable_debug); | 1869 | EXPORT_SYMBOL(jbd2_journal_enable_debug); |
1870 | #endif | ||
1871 | |||
1872 | #if defined(CONFIG_JBD2_DEBUG) && defined(CONFIG_DEBUG_FS) | ||
1873 | 1870 | ||
1874 | #define JBD2_DEBUG_NAME "jbd2-debug" | 1871 | #define JBD2_DEBUG_NAME "jbd2-debug" |
1875 | 1872 | ||
1876 | struct dentry *jbd2_debugfs_dir, *jbd2_debug; | 1873 | static struct dentry *jbd2_debugfs_dir; |
1874 | static struct dentry *jbd2_debug; | ||
1877 | 1875 | ||
1878 | static void __init jbd2_create_debugfs_entry(void) | 1876 | static void __init jbd2_create_debugfs_entry(void) |
1879 | { | 1877 | { |
@@ -1886,24 +1884,18 @@ static void __init jbd2_create_debugfs_entry(void) | |||
1886 | 1884 | ||
1887 | static void __exit jbd2_remove_debugfs_entry(void) | 1885 | static void __exit jbd2_remove_debugfs_entry(void) |
1888 | { | 1886 | { |
1889 | if (jbd2_debug) | 1887 | debugfs_remove(jbd2_debug); |
1890 | debugfs_remove(jbd2_debug); | 1888 | debugfs_remove(jbd2_debugfs_dir); |
1891 | if (jbd2_debugfs_dir) | ||
1892 | debugfs_remove(jbd2_debugfs_dir); | ||
1893 | } | 1889 | } |
1894 | 1890 | ||
1895 | #else | 1891 | #else |
1896 | 1892 | ||
1897 | static void __init jbd2_create_debugfs_entry(void) | 1893 | static void __init jbd2_create_debugfs_entry(void) |
1898 | { | 1894 | { |
1899 | do { | ||
1900 | } while (0); | ||
1901 | } | 1895 | } |
1902 | 1896 | ||
1903 | static void __exit jbd2_remove_debugfs_entry(void) | 1897 | static void __exit jbd2_remove_debugfs_entry(void) |
1904 | { | 1898 | { |
1905 | do { | ||
1906 | } while (0); | ||
1907 | } | 1899 | } |
1908 | 1900 | ||
1909 | #endif | 1901 | #endif |