From d1aa7d12ced7e7add0ebf0ace658bde32b693154 Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Thu, 4 Oct 2007 14:47:09 -0700
Subject: [PATCH] --- yaml --- r: 67718 b: refs/heads/master c:
 19b613d41051296be628581e7e21b847e9eaba80 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ocfs2/super.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0a34228b852f..ce890c6c6792 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 015452b15ff6c2d9fa1f82f28d61e7a66e2df86a
+refs/heads/master: 19b613d41051296be628581e7e21b847e9eaba80
diff --git a/trunk/fs/ocfs2/super.c b/trunk/fs/ocfs2/super.c
index c034b5129c1e..19436d1ff57f 100644
--- a/trunk/fs/ocfs2/super.c
+++ b/trunk/fs/ocfs2/super.c
@@ -1209,12 +1209,13 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err)
 		tmp = ocfs2_request_umount_vote(osb);
 		if (tmp < 0)
 			mlog_errno(tmp);
+	}
 
-		if (osb->slot_num != OCFS2_INVALID_SLOT)
-			ocfs2_put_slot(osb);
+	if (osb->slot_num != OCFS2_INVALID_SLOT)
+		ocfs2_put_slot(osb);
 
+	if (osb->dlm)
 		ocfs2_super_unlock(osb, 1);
-	}
 
 	ocfs2_release_system_inodes(osb);