]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ceph: fix memory leak due to possible dentry init race
authorSage Weil <sage@newdream.net>
Fri, 23 Apr 2010 18:36:54 +0000 (11:36 -0700)
committerSage Weil <sage@newdream.net>
Mon, 17 May 2010 22:25:23 +0000 (15:25 -0700)
Free dentry_info in error path.

Signed-off-by: Sage Weil <sage@newdream.net>
fs/ceph/dir.c

index 33feac75c532d48f93a05611feb939064cb1b495..422794fd10e0d7827e64faf772d982f1a3ab65aa 100644 (file)
@@ -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;