From 8acc143d80ab5cc5a96584308d8bfc8c93ea6023 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Fri, 11 Jul 2008 19:27:31 -0400 Subject: [PATCH] --- yaml --- r: 101100 b: refs/heads/master c: 47b4a50bebfd34b5e1fa2a9c673c8f31fa231cc1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/super.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c43e917e982e..4e0fcb28fcb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07031431072ece801d53d2c03d5e5bb21f4f64a4 +refs/heads/master: 47b4a50bebfd34b5e1fa2a9c673c8f31fa231cc1 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 80f06159ee99..1b330cd71ca8 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -506,6 +506,7 @@ static void ext4_put_super (struct super_block * sb) ext4_ext_release(sb); ext4_xattr_put_super(sb); jbd2_journal_destroy(sbi->s_journal); + sbi->s_journal = NULL; if (!(sb->s_flags & MS_RDONLY)) { EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER); es->s_state = cpu_to_le16(sbi->s_mount_state); @@ -2423,6 +2424,7 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) failed_mount4: jbd2_journal_destroy(sbi->s_journal); + sbi->s_journal = NULL; failed_mount3: percpu_counter_destroy(&sbi->s_freeblocks_counter); percpu_counter_destroy(&sbi->s_freeinodes_counter);