Re: [BUG][2.6.13.4] Memoryleak - idr_layer_cache slab - inotify?

[Stefan Jones <stefan.jones@churchillrandoms.co.uk>]

Andrew Morton wrote:

> Something like this?
>
>  
Yep, that fixes it. The  idr_layer_cache slab is now stable. Thanks

> diff -puN lib/idr.c~inotify-idr-leak-fix lib/idr.c
> --- 25/lib/idr.c~inotify-idr-leak-fix	Fri Oct 21 13:44:23 2005
> +++ 25-akpm/lib/idr.c	Fri Oct 21 13:46:09 2005
> @@ -346,6 +346,19 @@ void idr_remove(struct idr *idp, int id)
> EXPORT_SYMBOL(idr_remove);
>
> /**
> + * idr_destroy - release all cached layers within an idr tree
> + * idp: idr handle
> + */
> +void idr_destroy(struct idr *idp)
> +{
> +	while (idp->id_free_cnt) {
> +		struct idr_layer *p = alloc_layer(idp);
> +		kmem_cache_free(idr_layer_cache, p);
> +	}
> +}
> +EXPORT_SYMBOL(idr_destroy);
> +
> +/**
>  * idr_find - return pointer for given id
>  * @idp: idr handle
>  * @id: lookup key
> diff -puN include/linux/idr.h~inotify-idr-leak-fix include/linux/idr.h
> --- 25/include/linux/idr.h~inotify-idr-leak-fix	Fri Oct 21 13:44:23 2005
> +++ 25-akpm/include/linux/idr.h	Fri Oct 21 13:46:19 2005
> @@ -75,4 +75,5 @@ int idr_pre_get(struct idr *idp, unsigne
> int idr_get_new(struct idr *idp, void *ptr, int *id);
> int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id);
> void idr_remove(struct idr *idp, int id);
> +void idr_destroy(struct idr *idp);
> void idr_init(struct idr *idp);
> diff -puN fs/inotify.c~inotify-idr-leak-fix fs/inotify.c
> --- 25/fs/inotify.c~inotify-idr-leak-fix	Fri Oct 21 13:47:27 2005
> +++ 25-akpm/fs/inotify.c	Fri Oct 21 13:47:38 2005
> @@ -176,6 +176,7 @@ static inline void put_inotify_dev(struc
> 	if (atomic_dec_and_test(&dev->count)) {
> 		atomic_dec(&dev->user->inotify_devs);
> 		free_uid(dev->user);
> +		idr_destroy(&dev->idr);
> 		kfree(dev);
> 	}
> }
> _
>
>
>  

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/