From 1bd80e8dc7196945c79b4eec2fe5a4f728e9f287 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Wed, 6 Dec 2006 20:38:48 -0800
Subject: [PATCH] --- yaml --- r: 42888 b: refs/heads/master c:
 b3423415fbc2e5461605826317da1c8dbbf21f97 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9ab4fa5a5b7f..881a815ead94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d18de5a2721f84ffd6a5d637915746ed47becc1c
+refs/heads/master: b3423415fbc2e5461605826317da1c8dbbf21f97
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index a7c67cee5d83..d68631f18df1 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -68,15 +68,19 @@ struct dentry_stat_t dentry_stat = {
 	.age_limit = 45,
 };
 
-static void d_callback(struct rcu_head *head)
+static void __d_free(struct dentry *dentry)
 {
-	struct dentry * dentry = container_of(head, struct dentry, d_u.d_rcu);
-
 	if (dname_external(dentry))
 		kfree(dentry->d_name.name);
 	kmem_cache_free(dentry_cache, dentry); 
 }
 
+static void d_callback(struct rcu_head *head)
+{
+	struct dentry * dentry = container_of(head, struct dentry, d_u.d_rcu);
+	__d_free(dentry);
+}
+
 /*
  * no dcache_lock, please.  The caller must decrement dentry_stat.nr_dentry
  * inside dcache_lock.
@@ -85,7 +89,11 @@ static void d_free(struct dentry *dentry)
 {
 	if (dentry->d_op && dentry->d_op->d_release)
 		dentry->d_op->d_release(dentry);
- 	call_rcu(&dentry->d_u.d_rcu, d_callback);
+	/* if dentry was never inserted into hash, immediate free is OK */
+	if (dentry->d_hash.pprev == NULL)
+		__d_free(dentry);
+	else
+		call_rcu(&dentry->d_u.d_rcu, d_callback);
 }
 
 /*