summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoah Watkins <noahwatkins@gmail.com>2011-08-22 21:49:41 +0200
committerSage Weil <sage@newdream.net>2011-08-22 22:06:59 +0200
commit259a187ade45056fd44856654f78aa9e9f0f7c75 (patch)
tree9e402d904c854dc561526b80ad0f8977f42c5fbd
parentceph: fix encoding of ino only (not relative) paths (diff)
downloadlinux-259a187ade45056fd44856654f78aa9e9f0f7c75.tar.xz
linux-259a187ade45056fd44856654f78aa9e9f0f7c75.zip
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>
-rw-r--r--fs/ceph/super.c4
1 files changed, 2 insertions, 2 deletions
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;
}