NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
commit 1b29243933098cdbc31b579b5616e183b4275e2f upstream.

This reverts commit a44be64bbecb15a452496f60db6eacfee2b59c79.

Link: https://lore.kernel.org/r/653b3359-2005-21b1-039d-c55ca4cffdcc@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Theodore Ts'o 2023-06-08 09:57:04 -04:00 • committed by Greg Kroah-Hartman
parent 543c12c264
commit 77eed67ba2
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fs/ext4/super.c
View file

@ -6341,7 +6341,6 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
struct ext4_mount_options old_opts; struct ext4_mount_options old_opts;
ext4_group_t g; ext4_group_t g;
int err = 0; int err = 0;
int enable_rw = 0;
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
int enable_quota = 0; int enable_quota = 0;
int i, j; int i, j;
@ -6528,7 +6527,7 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
if (err) if (err)
goto restore_opts; goto restore_opts;
enable_rw = 1; sb->s_flags &= ~SB_RDONLY;
if (ext4_has_feature_mmp(sb)) { if (ext4_has_feature_mmp(sb)) {
err = ext4_multi_mount_protect(sb, err = ext4_multi_mount_protect(sb,
le64_to_cpu(es->s_mmp_block)); le64_to_cpu(es->s_mmp_block));
@ -6575,9 +6574,6 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
if (!test_opt(sb, BLOCK_VALIDITY) && sbi->s_system_blks) if (!test_opt(sb, BLOCK_VALIDITY) && sbi->s_system_blks)
ext4_release_system_zone(sb); ext4_release_system_zone(sb);
if (enable_rw)
sb->s_flags &= ~SB_RDONLY;
/* /*
* Reinitialize lazy itable initialization thread based on * Reinitialize lazy itable initialization thread based on
* current settings * current settings