aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3/super.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2007-07-16 02:41:08 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 12:05:47 -0400
commit030703e49d4966bd348660e0fdc2699507efb82b (patch)
tree7ff200c2834960fc70b2683007b7d13cdb7f761e /fs/ext3/super.c
parent8b3b295502444340dd0701855ac422fbf32e161d (diff)
ext3: fix deadlock in ext3_remount() and orphan list handling
ext3_orphan_add() and ext3_orphan_del() functions lock sb->s_lock with a transaction started with ext3_mark_recovery_complete() waits for a transaction holding sb->s_lock, thus leading to a possible deadlock. At the moment we call ext3_mark_recovery_complete() from ext3_remount() we have done all the work needed for remounting and thus we are safe to drop sb->s_lock before we wait for transactions to commit. Note that at this moment we are still guarded by s_umount lock against other remounts/umounts. Signed-off-by: Jan Kara <jack@suse.cz> Cc: Eric Sandeen <sandeen@sandeen.net> Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ext3/super.c')
-rw-r--r--fs/ext3/super.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 6ee4a95f4934..69a59d4580e9 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2147,12 +2147,14 @@ static void ext3_mark_recovery_complete(struct super_block * sb,
2147 2147
2148 journal_lock_updates(journal); 2148 journal_lock_updates(journal);
2149 journal_flush(journal); 2149 journal_flush(journal);
2150 lock_super(sb);
2150 if (EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER) && 2151 if (EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER) &&
2151 sb->s_flags & MS_RDONLY) { 2152 sb->s_flags & MS_RDONLY) {
2152 EXT3_CLEAR_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER); 2153 EXT3_CLEAR_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER);
2153 sb->s_dirt = 0; 2154 sb->s_dirt = 0;
2154 ext3_commit_super(sb, es, 1); 2155 ext3_commit_super(sb, es, 1);
2155 } 2156 }
2157 unlock_super(sb);
2156 journal_unlock_updates(journal); 2158 journal_unlock_updates(journal);
2157} 2159}
2158 2160
@@ -2341,7 +2343,13 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data)
2341 (sbi->s_mount_state & EXT3_VALID_FS)) 2343 (sbi->s_mount_state & EXT3_VALID_FS))
2342 es->s_state = cpu_to_le16(sbi->s_mount_state); 2344 es->s_state = cpu_to_le16(sbi->s_mount_state);
2343 2345
2346 /*
2347 * We have to unlock super so that we can wait for
2348 * transactions.
2349 */
2350 unlock_super(sb);
2344 ext3_mark_recovery_complete(sb, es); 2351 ext3_mark_recovery_complete(sb, es);
2352 lock_super(sb);
2345 } else { 2353 } else {
2346 __le32 ret; 2354 __le32 ret;
2347 if ((ret = EXT3_HAS_RO_COMPAT_FEATURE(sb, 2355 if ((ret = EXT3_HAS_RO_COMPAT_FEATURE(sb,