]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ceph: fix memory leak
authorNoah Watkins <noahwatkins@gmail.com>
Mon, 22 Aug 2011 19:49:41 +0000 (13:49 -0600)
committerSage Weil <sage@newdream.net>
Mon, 22 Aug 2011 20:06:59 +0000 (13:06 -0700)
kfree does not clean up indirect allocations in
ceph_fs_client and ceph_options (e.g. snapdir_name).

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Signed-off-by: Sage Weil <sage@newdream.net>
fs/ceph/super.c

index d47c5ec7fb1ff0500ebbeb7f403debfa865c87a0..88bacaf385d960fcd1ba98e99049e7a47658abe7 100644 (file)
@@ -813,8 +813,8 @@ static struct dentry *ceph_mount(struct file_system_type *fs_type,
        fsc = create_fs_client(fsopt, opt);
        if (IS_ERR(fsc)) {
                res = ERR_CAST(fsc);
-               kfree(fsopt);
-               kfree(opt);
+               destroy_mount_options(fsopt);
+               ceph_destroy_options(opt);
                goto out_final;
        }