2008-04-30 05:52:44

by Andrew Morton

[permalink] [raw]
Subject: - jbd2-only-create-debugfs-and-stats-entries-if-cache-initialisation-is-successful.patch removed from -mm tree

The patch titled
jbd2: only create debugfs and stats entries if cache initialisation is successful
has been removed from the -mm tree. Its filename was

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

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

Subject: jbd2: only create debugfs and stats entries if cache initialisation is successful
From: "Duane Griffin" <[email protected]>

jbd2 debugfs and stats entries should only be created if cache initialisation
is successful. At the moment they are being created unconditionally which
will leave them dangling if cache (and hence module) initialisation fails.

Signed-off-by: Duane Griffin <[email protected]>
Cc: <[email protected]>
Acked-by: Andreas Dilger <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

fs/jbd2/journal.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff -puN fs/jbd2/journal.c~jbd2-only-create-debugfs-and-stats-entries-if-cache-initialisation-is-successful fs/jbd2/journal.c
--- a/fs/jbd2/journal.c~jbd2-only-create-debugfs-and-stats-entries-if-cache-initialisation-is-successful
+++ a/fs/jbd2/journal.c
@@ -2319,10 +2319,12 @@ static int __init journal_init(void)
BUILD_BUG_ON(sizeof(struct journal_superblock_s) != 1024);

ret = journal_init_caches();
- if (ret != 0)
+ if (ret == 0) {
+ jbd2_create_debugfs_entry();
+ jbd2_create_jbd_stats_proc_entry();
+ } else {
- jbd2_create_debugfs_entry();
- jbd2_create_jbd_stats_proc_entry();
+ }
return ret;


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