Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47b4a50b authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: Set journal pointer to NULL when journal is released 



Set sbi->s_journal to NULL after we call journal_destroy(). This
will be later needed because after journal_destroy() is called,
ext4_clear_inode() can still be called for some inodes (e.g. root
inode) and we'll need to detect there that journal doesn't exists
anymore.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 07031431

fs/ext4/super.c

+2 −0
Original line number Diff line number Diff line
@@ -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);