From 237ed57a602ced5f812a84b3aee7105ffcd99638 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 1 May 2009 01:59:42 -0400 Subject: [PATCH] --- yaml --- r: 146367 b: refs/heads/master c: a63c9eb2ce6f5028da90f282798232c4f398ceb8 h: refs/heads/master i: 146365: 6b7af577861ff96c048ed2954e0b06f3354558e0 146363: 84918b02a328c5c02b373d3a3281cdd05cd98c5f 146359: bc216a165c0013fabffe8b407c42bddcb4adfa68 146351: de825cb128647f2efa5ba9905a5c3889fc462af2 146335: 6544906f439b032a4f7a1a151fa240cdd912eaeb 146303: b8a4aff8f6b03c2d8e0f192ec3cb9609bdb974e2 v: v3 --- [refs] | 2 +- trunk/fs/ext4/super.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 7058fac4382c..8d363ba50d5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 114e9fc90703bd6aac0229fb559e97caa6c49770 +refs/heads/master: a63c9eb2ce6f5028da90f282798232c4f398ceb8 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index e3b35f26d5fe..45d0ada9bfce 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -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); @@ -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,