From fb1b7a34a90a8e60530c85526828653c08a4f3ce Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@infradead.org>
Date: Sun, 10 Oct 2010 05:36:22 -0400
Subject: [PATCH] --- yaml --- r: 217807 b: refs/heads/master c:
 9c82ab9c9e16cb9edf17bd0d31f3d6904afce04f h: refs/heads/master i:   217805:
 8020d6e72e43cb96a33286112d23e874b8960450   217803:
 863bdc71e84dd1c109219590c2c15956602c1957   217799:
 c318acc9bce1df423b2be18a694205cfe90f8a11   217791:
 0b2e44e35e3e26af74f301f875e684745d7a3b75 v: v3

---
 [refs]            |  2 +-
 trunk/fs/dcache.c | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index fba00fc82881..589e8a05f3eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be148247cfbe2422f5709e77d9c3e10b8a6394da
+refs/heads/master: 9c82ab9c9e16cb9edf17bd0d31f3d6904afce04f
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index 54f93f5e6b0f..028753951e95 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -67,20 +67,16 @@ struct dentry_stat_t dentry_stat = {
 	.age_limit = 45,
 };
 
-static void __d_free(struct dentry *dentry)
+static void __d_free(struct rcu_head *head)
 {
+	struct dentry *dentry = container_of(head, struct dentry, d_u.d_rcu);
+
 	WARN_ON(!list_empty(&dentry->d_alias));
 	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.
@@ -91,9 +87,9 @@ static void d_free(struct dentry *dentry)
 		dentry->d_op->d_release(dentry);
 	/* if dentry was never inserted into hash, immediate free is OK */
 	if (hlist_unhashed(&dentry->d_hash))
-		__d_free(dentry);
+		__d_free(&dentry->d_u.d_rcu);
 	else
-		call_rcu(&dentry->d_u.d_rcu, d_callback);
+		call_rcu(&dentry->d_u.d_rcu, __d_free);
 }
 
 /*