2007-10-12 03:00:59

by Andrew Morton

[permalink] [raw]
Subject: - jbd2-debug-code-cleanup.patch removed from -mm tree

The patch titled
JBD2: debug code cleanup
has been removed from the -mm tree. Its filename was

This patch was dropped because it was merged into mainline or a subsystem tree

Subject: 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]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

diff -puN fs/jbd2/journal.c~jbd2-debug-code-cleanup fs/jbd2/journal.c
--- a/fs/jbd2/journal.c~jbd2-debug-code-cleanup
+++ a/fs/jbd2/journal.c
@@ -2199,16 +2199,14 @@ void jbd2_journal_put_journal_head(struc
* debugfs tunables
-#if defined(CONFIG_JBD2_DEBUG)
-u8 jbd2_journal_enable_debug;
+u8 jbd2_journal_enable_debug __read_mostly;
-#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)
@@ -2221,24 +2219,18 @@ static void __init jbd2_create_debugfs_e

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);


static void __init jbd2_create_debugfs_entry(void)
- do {
- } while (0);

static void __exit jbd2_remove_debugfs_entry(void)
- do {
- } while (0);


Patches currently in -mm which might be from [email protected] are