From 87ee7275e5c748370132881832aad21221f4b0da Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Sat, 25 Mar 2006 03:06:36 -0800
Subject: [PATCH] --- yaml --- r: 23502 b: refs/heads/master c:
 214fda1f6e1b8ef2a5292b0372744037fc80d318 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2e51a684279e..dd414bb573e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d99b7d634d81bb372e03e4561c80430aa4cfac2
+refs/heads/master: 214fda1f6e1b8ef2a5292b0372744037fc80d318
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index 653f64ce98e2..139e5fd22fa6 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -325,10 +325,13 @@ static struct dentry * __d_find_alias(struct inode *inode, int want_discon)
 
 struct dentry * d_find_alias(struct inode *inode)
 {
-	struct dentry *de;
-	spin_lock(&dcache_lock);
-	de = __d_find_alias(inode, 0);
-	spin_unlock(&dcache_lock);
+	struct dentry *de = NULL;
+
+	if (!list_empty(&inode->i_dentry)) {
+		spin_lock(&dcache_lock);
+		de = __d_find_alias(inode, 0);
+		spin_unlock(&dcache_lock);
+	}
 	return de;
 }