OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9561de3
)
Revert "ext4: don't clear SB_RDONLY when remounting r/w until quota is re-enabled"
author
Theodore Ts'o
<tytso@mit.edu>
Thu, 8 Jun 2023 13:57:04 +0000
(09:57 -0400)
committer
Theodore Ts'o
<tytso@mit.edu>
Thu, 8 Jun 2023 13:57:04 +0000
(09:57 -0400)
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>
fs/ext4/super.c
patch
|
blob
|
history
diff --git
a/fs/ext4/super.c
b/fs/ext4/super.c
index
56a5d1c
..
05fcecc
100644
(file)
--- a/
fs/ext4/super.c
+++ b/
fs/ext4/super.c
@@
-6388,7
+6388,6
@@
static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
struct ext4_mount_options old_opts;
ext4_group_t g;
int err = 0;
struct ext4_mount_options old_opts;
ext4_group_t g;
int err = 0;
- int enable_rw = 0;
#ifdef CONFIG_QUOTA
int enable_quota = 0;
int i, j;
#ifdef CONFIG_QUOTA
int enable_quota = 0;
int i, j;
@@
-6575,7
+6574,7
@@
static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
if (err)
goto restore_opts;
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));
if (ext4_has_feature_mmp(sb)) {
err = ext4_multi_mount_protect(sb,
le64_to_cpu(es->s_mmp_block));
@@
-6622,9
+6621,6
@@
static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
if (!test_opt(sb, BLOCK_VALIDITY) && sbi->s_system_blks)
ext4_release_system_zone(sb);
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
/*
* Reinitialize lazy itable initialization thread based on
* current settings