Re: [PATCH 2/2] ceph: fix memory leak

From: Sage Weil
Date: Mon Aug 22 2011 - 16:14:28 EST


Thanks, applied both of these!

sage

On Mon, 22 Aug 2011, Noah Watkins wrote:

> kfree does not clean up indirect allocations in
> ceph_fs_client and ceph_options (e.g. snapdir_name).
>
> Signed-off-by: Noah Watkins <noahwatkins@xxxxxxxxx>
> ---
> fs/ceph/super.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ceph/super.c b/fs/ceph/super.c
> index 733674d..788f5ad 100644
> --- a/fs/ceph/super.c
> +++ b/fs/ceph/super.c
> @@ -824,8 +824,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;
> }
>
> --
> 1.7.6
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/