Commit 46293fc6 authored by Theodore Ts'o's avatar Theodore Ts'o Committed by sanglipeng
Browse files

Revert "ext4: don't clear SB_RDONLY when remounting r/w until quota is re-enabled" 

stable inclusion
from stable-v5.10.184
commit fd6cb5171903b3e46fd4c7f0e730cda496f4b6c9
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8IRR2

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fd6cb5171903b3e46fd4c7f0e730cda496f4b6c9

--------------------------------

commit 1b292439 upstream.

This reverts commit a44be64b.

Link: https://lore.kernel.org/r/653b3359-2005-21b1-039d-c55ca4cffdcc@gmail.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 06fb6e8b

fs/ext4/super.c

+1 −5
Original line number Diff line number Diff line
@@ -5959,7 +5959,6 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
	ext4_group_t g;

	unsigned int journal_ioprio = DEFAULT_JOURNAL_IOPRIO;

	int err = 0;

	int enable_rw = 0;

#ifdef CONFIG_QUOTA

	int enable_quota = 0;

	int i, j;
@@ -6165,7 +6164,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
			if (err)

				goto restore_opts;



			enable_rw = 1;

			sb->s_flags &= ~SB_RDONLY;

			if (ext4_has_feature_mmp(sb)) {

				err = ext4_multi_mount_protect(sb,

						le64_to_cpu(es->s_mmp_block));
@@ -6212,9 +6211,6 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
	if (!test_opt(sb, BLOCK_VALIDITY) && sbi->s_system_blks)

		ext4_release_system_zone(sb);



	if (enable_rw)

		sb->s_flags &= ~SB_RDONLY;



	/*

	 * Reinitialize lazy itable initialization thread based on

	 * current settings