diff options
author | Eryu Guan <guaneryu@gmail.com> | 2011-10-31 22:06:19 -0400 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2011-11-09 06:23:17 -0500 |
commit | 63894ab9f63a688f6b0b8cdd01ac0a9f36d507b8 (patch) | |
tree | 6832649db558fd5f334353d3cb107c939b44dd2f /fs/ext3/super.c | |
parent | 19e0bafc36abd84a5b4d7c7745b78a6f4626e944 (diff) |
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 'fs/ext3/super.c')
-rw-r--r-- | fs/ext3/super.c | 5 |
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) | |||
2060 | EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS; | 2060 | EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS; |
2061 | ext3_orphan_cleanup(sb, es); | 2061 | ext3_orphan_cleanup(sb, es); |
2062 | EXT3_SB(sb)->s_mount_state &= ~EXT3_ORPHAN_FS; | 2062 | EXT3_SB(sb)->s_mount_state &= ~EXT3_ORPHAN_FS; |
2063 | if (needs_recovery) | 2063 | if (needs_recovery) { |
2064 | ext3_mark_recovery_complete(sb, es); | ||
2064 | ext3_msg(sb, KERN_INFO, "recovery complete"); | 2065 | ext3_msg(sb, KERN_INFO, "recovery complete"); |
2065 | ext3_mark_recovery_complete(sb, es); | 2066 | } |
2066 | ext3_msg(sb, KERN_INFO, "mounted filesystem with %s data mode", | 2067 | ext3_msg(sb, KERN_INFO, "mounted filesystem with %s data mode", |
2067 | test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA ? "journal": | 2068 | test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA ? "journal": |
2068 | test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered": | 2069 | test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered": |