Commit 50460fe8 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Theodore Ts'o
Browse files

ext4: remove extent status procfs files if journal load fails 



If we can't load the journal, remove the procfs files for the extent
status information file to avoid leaking resources.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
parent 6b992ff2

fs/ext4/super.c

+3 −2
Original line number Diff line number Diff line
@@ -3947,7 +3947,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_MMP) &&

	    !(sb->s_flags & MS_RDONLY))

		if (ext4_multi_mount_protect(sb, le64_to_cpu(es->s_mmp_block)))

			goto failed_mount3;

			goto failed_mount3a;



	/*

	 * The first inode we look at is the journal inode.  Don't try
@@ -3956,7 +3956,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	if (!test_opt(sb, NOLOAD) &&

	    EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_HAS_JOURNAL)) {

		if (ext4_load_journal(sb, es, journal_devnum))

			goto failed_mount3;

			goto failed_mount3a;

	} else if (test_opt(sb, NOLOAD) && !(sb->s_flags & MS_RDONLY) &&

	      EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER)) {

		ext4_msg(sb, KERN_ERR, "required journal recovery "
@@ -4244,6 +4244,7 @@ failed_mount_wq: 
		jbd2_journal_destroy(sbi->s_journal);

		sbi->s_journal = NULL;

	}

failed_mount3a:

	ext4_es_unregister_shrinker(sbi);

failed_mount3:

	del_timer_sync(&sbi->s_err_report);

CRA Git | Maintained and supported by SUSTech CRA and CCSE