aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3/super.c
diff options
context:
space:
mode:
authorEryu Guan <guaneryu@gmail.com>2011-11-01 10:06:19 +0800
committerJan Kara <jack@suse.cz>2011-11-09 12:23:17 +0100
commit63894ab9f63a688f6b0b8cdd01ac0a9f36d507b8 (patch)
tree6832649db558fd5f334353d3cb107c939b44dd2f /fs/ext3/super.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux (diff)
downloadlinux-dev-63894ab9f63a688f6b0b8cdd01ac0a9f36d507b8.tar.xz
linux-dev-63894ab9f63a688f6b0b8cdd01ac0a9f36d507b8.zip
ext3: call ext3_mark_recovery_complete() when recovery is really needed
Call ext3_mark_recovery_complete() in ext3_fill_super() only if needs_recovery is non-zero. Besides that, print out "recovery complete" message after calling ext3_mark_recovery_complete(). Cc: Jan Kara <jack@suse.cz> Signed-off-by: Eryu Guan <guaneryu@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to '')
-rw-r--r--fs/ext3/super.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 922d289aeeb3..767fa3a2bd17 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2060,9 +2060,10 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS;
ext3_orphan_cleanup(sb, es);
EXT3_SB(sb)->s_mount_state &= ~EXT3_ORPHAN_FS;
- if (needs_recovery)
+ if (needs_recovery) {
+ ext3_mark_recovery_complete(sb, es);
ext3_msg(sb, KERN_INFO, "recovery complete");
- ext3_mark_recovery_complete(sb, es);
+ }
ext3_msg(sb, KERN_INFO, "mounted filesystem with %s data mode",
test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA ? "journal":
test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":