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

Commit d01b5fc0 authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman
Browse files

ext4: handle error of ext4_setup_system_zone() on remount 



commit d176b1f62f242ab259ff665a26fbac69db1aecba upstream.

ext4_setup_system_zone() can fail. Handle the failure in ext4_remount().

Reviewed-by: default avatarLukas Czerner <lczerner@redhat.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20200728130437.7804-2-jack@suse.cz


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ba8eed7

fs/ext4/super.c

+4 −1
Original line number Diff line number Diff line
@@ -5148,7 +5148,10 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
		ext4_register_li_request(sb, first_not_zeroed);

	}



	ext4_setup_system_zone(sb);

	err = ext4_setup_system_zone(sb);

	if (err)

		goto restore_opts;



	if (sbi->s_journal == NULL && !(old_sb_flags & MS_RDONLY))

		ext4_commit_super(sb, 1);