leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jbd: config_jbd_debug cannot create /proc entry

Browse Source 
The jbd-debug file used to be located in /proc/sys/fs/jbd-debug, but
create_proc_entry() does not do lookups on file names that are more that
one directory deep.  This causes the entry creation to fail and hence, no
proc file is created.

Instead of fixing this on procfs might as well move the jbd2-debug file to
debugfs which would be the preferred location for this kind of tunable.
The new location is now /sys/kernel/debug/jbd/jbd-debug.

[akpm@linux-foundation.org: zillions of cleanups]
Signed-off-by: Jose R. Santos <jrs@us.ibm.com>
Acked-by: Jan Kara <jack@suse.cz>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jose R. Santos 2007-10-18 23:39:22 -07:00 committed by Linus Torvalds
parent 1c09924448
commit c2a9159cdd
3 changed files with 31 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/Kconfig
View File

@ -220,7 +220,7 @@ config JBD
config JBD_DEBUG config JBD_DEBUG
bool "JBD (ext3) debugging support" bool "JBD (ext3) debugging support"
depends on JBD depends on JBD && DEBUG_FS
help help
If you are using the ext3 journaled file system (or potentially any If you are using the ext3 journaled file system (or potentially any
other file system/device using JBD), this option allows you to other file system/device using JBD), this option allows you to
@ -229,10 +229,10 @@ config JBD_DEBUG
debugging output will be turned off. debugging output will be turned off.
If you select Y here, then you will be able to turn on debugging If you select Y here, then you will be able to turn on debugging
with "echo N > /proc/sys/fs/jbd-debug", where N is a number between with "echo N > /sys/kernel/debug/jbd/jbd-debug", where N is a
1 and 5, the higher the number, the more debugging output is number between 1 and 5, the higher the number, the more debugging
generated. To turn debugging off again, do output is generated. To turn debugging off again, do
"echo 0 > /proc/sys/fs/jbd-debug". "echo 0 > /sys/kernel/debug/jbd/jbd-debug".
config JBD2 config JBD2
tristate tristate

72
fs/jbd/journal.c
View File

@ -35,6 +35,7 @@
#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 <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/page.h> #include <asm/page.h>
@ -1851,63 +1852,40 @@ void journal_put_journal_head(struct journal_head *jh)
} }
/* /*
* /proc tunables * debugfs tunables
*/ */
#if defined(CONFIG_JBD_DEBUG) #ifdef CONFIG_JBD_DEBUG
int journal_enable_debug;
u8 journal_enable_debug __read_mostly;
EXPORT_SYMBOL(journal_enable_debug); EXPORT_SYMBOL(journal_enable_debug);
#endif
#if defined(CONFIG_JBD_DEBUG) && defined(CONFIG_PROC_FS) static struct dentry *jbd_debugfs_dir;
static struct dentry *jbd_debug;
static struct proc_dir_entry *proc_jbd_debug; static void __init jbd_create_debugfs_entry(void)
static int read_jbd_debug(char *page, char **start, off_t off,
int count, int *eof, void *data)
{ {
int ret; jbd_debugfs_dir = debugfs_create_dir("jbd", NULL);
if (jbd_debugfs_dir)
ret = sprintf(page + off, "%d\n", journal_enable_debug); jbd_debug = debugfs_create_u8("jbd-debug", S_IRUGO,
*eof = 1; jbd_debugfs_dir,
return ret; &journal_enable_debug);
} }
static int write_jbd_debug(struct file *file, const char __user *buffer, static void __exit jbd_remove_debugfs_entry(void)
unsigned long count, void *data)
{ {
char buf[32]; debugfs_remove(jbd_debug);
debugfs_remove(jbd_debugfs_dir);
if (count > ARRAY_SIZE(buf) - 1)
count = ARRAY_SIZE(buf) - 1;
if (copy_from_user(buf, buffer, count))
return -EFAULT;
buf[ARRAY_SIZE(buf) - 1] = '\0';
journal_enable_debug = simple_strtoul(buf, NULL, 10);
return count;
}
#define JBD_PROC_NAME "sys/fs/jbd-debug"
static void __init create_jbd_proc_entry(void)
{
proc_jbd_debug = create_proc_entry(JBD_PROC_NAME, 0644, NULL);
if (proc_jbd_debug) {
/* Why is this so hard? */
proc_jbd_debug->read_proc = read_jbd_debug;
proc_jbd_debug->write_proc = write_jbd_debug;
}
}
static void __exit remove_jbd_proc_entry(void)
{
if (proc_jbd_debug)
remove_proc_entry(JBD_PROC_NAME, NULL);
} }
#else #else
#define create_jbd_proc_entry() do {} while (0) static inline void jbd_create_debugfs_entry(void)
#define remove_jbd_proc_entry() do {} while (0) {
}
static inline void jbd_remove_debugfs_entry(void)
{
}
#endif #endif
@ -1965,7 +1943,7 @@ static int __init journal_init(void)
ret = journal_init_caches(); ret = journal_init_caches();
if (ret != 0) if (ret != 0)
journal_destroy_caches(); journal_destroy_caches();
create_jbd_proc_entry(); jbd_create_debugfs_entry();
return ret; return ret;
} }
@ -1976,7 +1954,7 @@ static void __exit journal_exit(void)
if (n) if (n)
printk(KERN_EMERG "JBD: leaked %d journal_heads!\n", n); printk(KERN_EMERG "JBD: leaked %d journal_heads!\n", n);
#endif #endif
remove_jbd_proc_entry(); jbd_remove_debugfs_entry();
journal_destroy_caches(); journal_destroy_caches();
} }

2
include/linux/jbd.h
View File

@ -58,7 +58,7 @@
* CONFIG_JBD_DEBUG is on. * CONFIG_JBD_DEBUG is on.
*/ */
#define JBD_EXPENSIVE_CHECKING #define JBD_EXPENSIVE_CHECKING
extern int journal_enable_debug; extern u8 journal_enable_debug;
#define jbd_debug(n, f, a...) \ #define jbd_debug(n, f, a...) \
do { \ do { \