From 82970d705b5a7c81c1ffecf2e07f7246b40b2118 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 23 Apr 2010 11:36:54 -0700
Subject: [PATCH] --- yaml --- r: 198061 b: refs/heads/master c:
 8c6efb58a5bab880d45b2078cb55ec4320707daf h: refs/heads/master i:   198059:
 87a45ab8abb4a5fc12ec1cc96b445a36d4bfb92c v: v3

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

diff --git a/[refs] b/[refs]
index 2c5c7a384a6f..e6cbd49c0cb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 559c1e0073ae779d60e1c673cda837f3e4295302
+refs/heads/master: 8c6efb58a5bab880d45b2078cb55ec4320707daf
diff --git a/trunk/fs/ceph/dir.c b/trunk/fs/ceph/dir.c
index 33feac75c532..422794fd10e0 100644
--- a/trunk/fs/ceph/dir.c
+++ b/trunk/fs/ceph/dir.c
@@ -51,8 +51,11 @@ int ceph_init_dentry(struct dentry *dentry)
 		return -ENOMEM;          /* oh well */
 
 	spin_lock(&dentry->d_lock);
-	if (dentry->d_fsdata) /* lost a race */
+	if (dentry->d_fsdata) {
+		/* lost a race */
+		kmem_cache_free(ceph_dentry_cachep, di);
 		goto out_unlock;
+	}
 	di->dentry = dentry;
 	di->lease_session = NULL;
 	dentry->d_fsdata = di;