From: Sage Weil <sage@newdream.net>
Date: Fri, 23 Apr 2010 18:36:54 +0000 (-0700)
Subject: ceph: fix memory leak due to possible dentry init race
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8c6efb58a5bab880d45b2078cb55ec4320707daf;p=linux-beck.git

ceph: fix memory leak due to possible dentry init race

Free dentry_info in error path.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 33feac75c532..422794fd10e0 100644
--- a/fs/ceph/dir.c
+++ b/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;