From ae50a24602435cd9652b1d360ed5e730c553eacb Mon Sep 17 00:00:00 2001 From: Duane Griffin Date: Tue, 29 Apr 2008 22:02:47 -0400 Subject: [PATCH] --- yaml --- r: 95050 b: refs/heads/master c: 620de4e19890c623eb4ba293ec19b42e2e391b89 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd2/journal.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2c105045aeb7..ad639ae4b87c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5648ba5b2dc0d07a8108fabc7b9100962e9e1d88 +refs/heads/master: 620de4e19890c623eb4ba293ec19b42e2e391b89 diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c index d707a219e21b..64356e85a10f 100644 --- a/trunk/fs/jbd2/journal.c +++ b/trunk/fs/jbd2/journal.c @@ -2307,10 +2307,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_journal_destroy_caches(); - jbd2_create_debugfs_entry(); - jbd2_create_jbd_stats_proc_entry(); + } return ret; }