Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 146367
b: refs/heads/master
c: a63c9eb
h: refs/heads/master
i:
  146365: 6b7af57
  146363: 84918b0
  146359: bc216a1
  146351: de825cb
  146335: 6544906
  146303: b8a4aff
v: v3
  • Loading branch information
Theodore Ts'o committed May 1, 2009
1 parent 731dd02 commit 237ed57
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 114e9fc90703bd6aac0229fb559e97caa6c49770
refs/heads/master: a63c9eb2ce6f5028da90f282798232c4f398ceb8
11 changes: 1 addition & 10 deletions trunk/fs/ext4/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -3219,13 +3219,11 @@ static void ext4_mark_recovery_complete(struct super_block *sb,
if (jbd2_journal_flush(journal) < 0)
goto out;

lock_super(sb);
if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER) &&
sb->s_flags & MS_RDONLY) {
EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);
ext4_commit_super(sb, 1);
}
unlock_super(sb);

out:
jbd2_journal_unlock_updates(journal);
Expand Down Expand Up @@ -3436,15 +3434,8 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data)
(sbi->s_mount_state & EXT4_VALID_FS))
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);
lock_super(sb);
}
} else {
int ret;
if ((ret = EXT4_HAS_RO_COMPAT_FEATURE(sb,
Expand Down

0 comments on commit 237ed57

Please sign in to comment.