mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
jbd2: use module parameters instead of debugfs for jbd_debug
There are multiple reasons to move away from debugfs. First of all, we are only using it for a single parameter, and it is much more complicated to set up (some 30 lines of code compared to 3), and one more thing that might fail while loading the jbd2 module. Secondly, as a module paramter it can be specified as a boot option if jbd2 is built into the kernel, or as a parameter when the module is loaded, and it can also be manipulated dynamically under /sys/module/jbd2/parameters/jbd2_debug. So it is more flexible. Ultimately we want to move away from using jbd_debug() towards tracepoints, but for now this is still a useful simplification of the code base. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
parent
a0b30c1229
commit
b6e96d0067
2 changed files with 9 additions and 44 deletions
|
@ -35,7 +35,6 @@
|
||||||
#include <linux/kthread.h>
|
#include <linux/kthread.h>
|
||||||
#include <linux/poison.h>
|
#include <linux/poison.h>
|
||||||
#include <linux/proc_fs.h>
|
#include <linux/proc_fs.h>
|
||||||
#include <linux/debugfs.h>
|
|
||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/math64.h>
|
#include <linux/math64.h>
|
||||||
#include <linux/hash.h>
|
#include <linux/hash.h>
|
||||||
|
@ -51,6 +50,14 @@
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
#include <asm/page.h>
|
#include <asm/page.h>
|
||||||
|
|
||||||
|
#ifdef CONFIG_JBD2_DEBUG
|
||||||
|
ushort jbd2_journal_enable_debug __read_mostly;
|
||||||
|
EXPORT_SYMBOL(jbd2_journal_enable_debug);
|
||||||
|
|
||||||
|
module_param_named(jbd2_debug, jbd2_journal_enable_debug, ushort, 0644);
|
||||||
|
MODULE_PARM_DESC(jbd2_debug, "Debugging level for jbd2");
|
||||||
|
#endif
|
||||||
|
|
||||||
EXPORT_SYMBOL(jbd2_journal_extend);
|
EXPORT_SYMBOL(jbd2_journal_extend);
|
||||||
EXPORT_SYMBOL(jbd2_journal_stop);
|
EXPORT_SYMBOL(jbd2_journal_stop);
|
||||||
EXPORT_SYMBOL(jbd2_journal_lock_updates);
|
EXPORT_SYMBOL(jbd2_journal_lock_updates);
|
||||||
|
@ -2495,45 +2502,6 @@ void jbd2_journal_release_jbd_inode(journal_t *journal,
|
||||||
spin_unlock(&journal->j_list_lock);
|
spin_unlock(&journal->j_list_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* debugfs tunables
|
|
||||||
*/
|
|
||||||
#ifdef CONFIG_JBD2_DEBUG
|
|
||||||
u8 jbd2_journal_enable_debug __read_mostly;
|
|
||||||
EXPORT_SYMBOL(jbd2_journal_enable_debug);
|
|
||||||
|
|
||||||
#define JBD2_DEBUG_NAME "jbd2-debug"
|
|
||||||
|
|
||||||
static struct dentry *jbd2_debugfs_dir;
|
|
||||||
static struct dentry *jbd2_debug;
|
|
||||||
|
|
||||||
static void __init jbd2_create_debugfs_entry(void)
|
|
||||||
{
|
|
||||||
jbd2_debugfs_dir = debugfs_create_dir("jbd2", NULL);
|
|
||||||
if (jbd2_debugfs_dir)
|
|
||||||
jbd2_debug = debugfs_create_u8(JBD2_DEBUG_NAME,
|
|
||||||
S_IRUGO | S_IWUSR,
|
|
||||||
jbd2_debugfs_dir,
|
|
||||||
&jbd2_journal_enable_debug);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __exit jbd2_remove_debugfs_entry(void)
|
|
||||||
{
|
|
||||||
debugfs_remove(jbd2_debug);
|
|
||||||
debugfs_remove(jbd2_debugfs_dir);
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
static void __init jbd2_create_debugfs_entry(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __exit jbd2_remove_debugfs_entry(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_PROC_FS
|
#ifdef CONFIG_PROC_FS
|
||||||
|
|
||||||
|
@ -2619,7 +2587,6 @@ static int __init journal_init(void)
|
||||||
|
|
||||||
ret = journal_init_caches();
|
ret = journal_init_caches();
|
||||||
if (ret == 0) {
|
if (ret == 0) {
|
||||||
jbd2_create_debugfs_entry();
|
|
||||||
jbd2_create_jbd_stats_proc_entry();
|
jbd2_create_jbd_stats_proc_entry();
|
||||||
} else {
|
} else {
|
||||||
jbd2_journal_destroy_caches();
|
jbd2_journal_destroy_caches();
|
||||||
|
@ -2634,7 +2601,6 @@ static void __exit journal_exit(void)
|
||||||
if (n)
|
if (n)
|
||||||
printk(KERN_EMERG "JBD2: leaked %d journal_heads!\n", n);
|
printk(KERN_EMERG "JBD2: leaked %d journal_heads!\n", n);
|
||||||
#endif
|
#endif
|
||||||
jbd2_remove_debugfs_entry();
|
|
||||||
jbd2_remove_jbd_stats_proc_entry();
|
jbd2_remove_jbd_stats_proc_entry();
|
||||||
jbd2_journal_destroy_caches();
|
jbd2_journal_destroy_caches();
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
#ifndef __KERNEL__
|
#ifndef __KERNEL__
|
||||||
#include "jfs_compat.h"
|
#include "jfs_compat.h"
|
||||||
#define JBD2_DEBUG
|
#define JBD2_DEBUG
|
||||||
#define jfs_debug jbd_debug
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
|
@ -57,7 +56,7 @@
|
||||||
* CONFIG_JBD2_DEBUG is on.
|
* CONFIG_JBD2_DEBUG is on.
|
||||||
*/
|
*/
|
||||||
#define JBD2_EXPENSIVE_CHECKING
|
#define JBD2_EXPENSIVE_CHECKING
|
||||||
extern u8 jbd2_journal_enable_debug;
|
extern ushort jbd2_journal_enable_debug;
|
||||||
|
|
||||||
#define jbd_debug(n, f, a...) \
|
#define jbd_debug(n, f, a...) \
|
||||||
do { \
|
do { \
|
||||||
|
|
Loading…
Reference in a new issue