From: Sunil Mushran Date: Tue, 29 Nov 2011 20:55:54 +0000 (-0800) Subject: ocfs2: Rollback commit 5fd131893793567c361ae64cbeb28a2a753bbe35 X-Git-Tag: v2.6.39-400.9.0~572 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1714202097fb5e8d4cfde602e5f869bb44815193;p=users%2Fjedix%2Flinux-maple.git ocfs2: Rollback commit 5fd131893793567c361ae64cbeb28a2a753bbe35 This patch is part 1 of 3 patches that rolls back changes that appear to have broken delete. Those patches were originally added to fix a deadlock with quotas enabled. Considering we are not enabling quotas in OVM3, it is ok to rollback these patches. We will have to solve the deadlock in another way. Signed-off-by: Sunil Mushran --- diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index d436c1f49684..b838e0ec8ba4 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1253,17 +1253,13 @@ static void ocfs2_kill_sb(struct super_block *sb) { struct ocfs2_super *osb = OCFS2_SB(sb); - /* Failed mount? */ - if (!osb || atomic_read(&osb->vol_state) == VOLUME_DISABLED) - goto out; - /* Prevent further queueing of inode drop events */ spin_lock(&dentry_list_lock); ocfs2_set_osb_flag(osb, OCFS2_OSB_DROP_DENTRY_LOCK_IMMED); spin_unlock(&dentry_list_lock); /* Wait for work to finish and/or remove it */ cancel_work_sync(&osb->dentry_lock_work); -out: + kill_block_super(sb); }