From: Noah Watkins <noahwatkins@gmail.com>
Date: Mon, 22 Aug 2011 19:49:41 +0000 (-0600)
Subject: ceph: fix memory leak
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=259a187ade45056fd44856654f78aa9e9f0f7c75;p=openwrt%2Fstaging%2Fblogic.git

ceph: fix memory leak

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>
---

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index d47c5ec7fb1f..88bacaf385d9 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -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;
 	}