From 731dd02484cfd77c631cc372611ba2816e445738 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 25 Apr 2009 15:48:07 -0400 Subject: [PATCH] --- yaml --- r: 146366 b: refs/heads/master c: 114e9fc90703bd6aac0229fb559e97caa6c49770 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/super.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 8400a0c66a83..7058fac4382c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8df9675f8b498d0bfa1f0b5b06f56bf1ff366dd5 +refs/heads/master: 114e9fc90703bd6aac0229fb559e97caa6c49770 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index fcd7b24c6df3..e3b35f26d5fe 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -2828,14 +2828,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) goto failed_mount4; }; - /* - * akpm: core read_super() calls in here with the superblock locked. - * That deadlocks, because orphan cleanup needs to lock the superblock - * in numerous places. Here we just pop the lock - it's relatively - * harmless, because we are now ready to accept write_super() requests, - * and aviro says that's the only reason for hanging onto the - * superblock lock. - */ EXT4_SB(sb)->s_mount_state |= EXT4_ORPHAN_FS; ext4_orphan_cleanup(sb, es); EXT4_SB(sb)->s_mount_state &= ~EXT4_ORPHAN_FS;