Skip to content

Commit 1b29243

Browse files
committed
Revert "ext4: don't clear SB_RDONLY when remounting r/w until quota is re-enabled"
This reverts commit a44be64. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent 9561de3 commit 1b29243

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

fs/ext4/super.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6388,7 +6388,6 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
63886388
struct ext4_mount_options old_opts;
63896389
ext4_group_t g;
63906390
int err = 0;
6391-
int enable_rw = 0;
63926391
#ifdef CONFIG_QUOTA
63936392
int enable_quota = 0;
63946393
int i, j;
@@ -6575,7 +6574,7 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
65756574
if (err)
65766575
goto restore_opts;
65776576

6578-
enable_rw = 1;
6577+
sb->s_flags &= ~SB_RDONLY;
65796578
if (ext4_has_feature_mmp(sb)) {
65806579
err = ext4_multi_mount_protect(sb,
65816580
le64_to_cpu(es->s_mmp_block));
@@ -6622,9 +6621,6 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
66226621
if (!test_opt(sb, BLOCK_VALIDITY) && sbi->s_system_blks)
66236622
ext4_release_system_zone(sb);
66246623

6625-
if (enable_rw)
6626-
sb->s_flags &= ~SB_RDONLY;
6627-
66286624
/*
66296625
* Reinitialize lazy itable initialization thread based on
66306626
* current settings

0 commit comments

Comments
 (0)