|
@@ -3219,13 +3219,11 @@ static void ext4_mark_recovery_complete(struct super_block *sb,
|
|
if (jbd2_journal_flush(journal) < 0)
|
|
if (jbd2_journal_flush(journal) < 0)
|
|
goto out;
|
|
goto out;
|
|
|
|
|
|
- lock_super(sb);
|
|
|
|
if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER) &&
|
|
if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER) &&
|
|
sb->s_flags & MS_RDONLY) {
|
|
sb->s_flags & MS_RDONLY) {
|
|
EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);
|
|
EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);
|
|
ext4_commit_super(sb, 1);
|
|
ext4_commit_super(sb, 1);
|
|
}
|
|
}
|
|
- unlock_super(sb);
|
|
|
|
|
|
|
|
out:
|
|
out:
|
|
jbd2_journal_unlock_updates(journal);
|
|
jbd2_journal_unlock_updates(journal);
|
|
@@ -3436,15 +3434,8 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
|
|
(sbi->s_mount_state & EXT4_VALID_FS))
|
|
(sbi->s_mount_state & EXT4_VALID_FS))
|
|
es->s_state = cpu_to_le16(sbi->s_mount_state);
|
|
es->s_state = cpu_to_le16(sbi->s_mount_state);
|
|
|
|
|
|
- /*
|
|
|
|
- * We have to unlock super so that we can wait for
|
|
|
|
- * transactions.
|
|
|
|
- */
|
|
|
|
- if (sbi->s_journal) {
|
|
|
|
- unlock_super(sb);
|
|
|
|
|
|
+ if (sbi->s_journal)
|
|
ext4_mark_recovery_complete(sb, es);
|
|
ext4_mark_recovery_complete(sb, es);
|
|
- lock_super(sb);
|
|
|
|
- }
|
|
|
|
} else {
|
|
} else {
|
|
int ret;
|
|
int ret;
|
|
if ((ret = EXT4_HAS_RO_COMPAT_FEATURE(sb,
|
|
if ((ret = EXT4_HAS_RO_COMPAT_FEATURE(sb,
|