From 6c62d692414d63ef1bf0a736aa57f38b9acff61e Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Wed, 7 Nov 2007 16:35:14 -0800
Subject: [PATCH] --- yaml --- r: 74290 b: refs/heads/master c:
 bccb9dad8949cd0df1d3d2188a1fdb4b1936d537 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/fs/ocfs2/dcache.c | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e8dcdbd48805..74197a91a4dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a58c3ef22d6e5b84ff651a7d27ae2cbea9f9870
+refs/heads/master: bccb9dad8949cd0df1d3d2188a1fdb4b1936d537
diff --git a/trunk/fs/ocfs2/dcache.c b/trunk/fs/ocfs2/dcache.c
index 1957a5ed219e..9923278ea6d4 100644
--- a/trunk/fs/ocfs2/dcache.c
+++ b/trunk/fs/ocfs2/dcache.c
@@ -344,12 +344,24 @@ static void ocfs2_dentry_iput(struct dentry *dentry, struct inode *inode)
 {
 	struct ocfs2_dentry_lock *dl = dentry->d_fsdata;
 
-	mlog_bug_on_msg(!dl && !(dentry->d_flags & DCACHE_DISCONNECTED),
-			"dentry: %.*s\n", dentry->d_name.len,
-			dentry->d_name.name);
+	if (!dl) {
+		/*
+		 * No dentry lock is ok if we're disconnected or
+		 * unhashed.
+		 */
+		if (!(dentry->d_flags & DCACHE_DISCONNECTED) &&
+		    !d_unhashed(dentry)) {
+			unsigned long long ino = 0ULL;
+			if (inode)
+				ino = (unsigned long long)OCFS2_I(inode)->ip_blkno;
+			mlog(ML_ERROR, "Dentry is missing cluster lock. "
+			     "inode: %llu, d_flags: 0x%x, d_name: %.*s\n",
+			     ino, dentry->d_flags, dentry->d_name.len,
+			     dentry->d_name.name);
+		}
 
-	if (!dl)
 		goto out;
+	}
 
 	mlog_bug_on_msg(dl->dl_count == 0, "dentry: %.*s, count: %u\n",
 			dentry->d_name.len, dentry->d_name.name,