|
@@ -2776,6 +2776,12 @@ static int ext4_feature_set_ok(struct super_block *sb, int readonly)
|
|
|
if (readonly)
|
|
|
return 1;
|
|
|
|
|
|
+ if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_READONLY)) {
|
|
|
+ ext4_msg(sb, KERN_INFO, "filesystem is read-only");
|
|
|
+ sb->s_flags |= MS_RDONLY;
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+
|
|
|
/* Check that feature set is OK for a read-write mount */
|
|
|
if (EXT4_HAS_RO_COMPAT_FEATURE(sb, ~EXT4_FEATURE_RO_COMPAT_SUPP)) {
|
|
|
ext4_msg(sb, KERN_ERR, "couldn't mount RDWR because of "
|
|
@@ -4929,7 +4935,9 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
|
|
|
ext4_mark_recovery_complete(sb, es);
|
|
|
} else {
|
|
|
/* Make sure we can mount this feature set readwrite */
|
|
|
- if (!ext4_feature_set_ok(sb, 0)) {
|
|
|
+ if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
|
|
|
+ EXT4_FEATURE_RO_COMPAT_READONLY) ||
|
|
|
+ !ext4_feature_set_ok(sb, 0)) {
|
|
|
err = -EROFS;
|
|
|
goto restore_opts;
|
|
|
}
|