aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ext3/super.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 7ad1e8c30bd0..8ad566b845ae 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2014,14 +2014,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
2014 } 2014 }
2015 2015
2016 ext3_setup_super (sb, es, sb->s_flags & MS_RDONLY); 2016 ext3_setup_super (sb, es, sb->s_flags & MS_RDONLY);
2017 /* 2017
2018 * akpm: core read_super() calls in here with the superblock locked.
2019 * That deadlocks, because orphan cleanup needs to lock the superblock
2020 * in numerous places. Here we just pop the lock - it's relatively
2021 * harmless, because we are now ready to accept write_super() requests,
2022 * and aviro says that's the only reason for hanging onto the
2023 * superblock lock.
2024 */
2025 EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS; 2018 EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS;
2026 ext3_orphan_cleanup(sb, es); 2019 ext3_orphan_cleanup(sb, es);
2027 EXT3_SB(sb)->s_mount_state &= ~EXT3_ORPHAN_FS; 2020 EXT3_SB(sb)->s_mount_state &= ~EXT3_ORPHAN_FS;