---

yaml --- r: 198061 b: refs/heads/master c: 8c6efb5 h: refs/heads/master i: 198059: 87a45ab v: v3
git-mirror · May 17, 2010 · 82970d7 · 82970d7
1 parent e434ec5
commit 82970d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;