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 <sunil.mushran@oracle.com>

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index d436c1f49684d55d68b56807152975357622ea33..b838e0ec8ba49058f81597aa48d10379ccae22db 100644 (file)
--- 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);
 }