Re: [PATCH] fs/bio: bio_alloc_bioset: pass right object ptr to mempool_free

[Jens Axboe]

On Sun, Feb 15 2009, Subhash Peddamallu wrote:
> When freeing from bio pool use right ptr to account for bs->front_pad,
> instead of bio ptr,
> 
> Signed-off-by: Subhash Peddamallu <subhash.peddamallu@xxxxxxxxx>
> ---
>  fs/bio.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/bio.c b/fs/bio.c
> index 062299a..72ab251 100644
> --- a/fs/bio.c
> +++ b/fs/bio.c
> @@ -302,9 +302,10 @@ void bio_init(struct bio *bio)
>  struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs)
>  {
>  	struct bio *bio = NULL;
> +	void *p;
> 
>  	if (bs) {
> -		void *p = mempool_alloc(bs->bio_pool, gfp_mask);
> +		p = mempool_alloc(bs->bio_pool, gfp_mask);
> 
>  		if (p)
>  			bio = p + bs->front_pad;
> @@ -329,7 +330,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int
> nr_iovecs, struct bio_set *bs)
>  			}
>  			if (unlikely(!bvl)) {
>  				if (bs)
> -					mempool_free(bio, bs->bio_pool);
> +					mempool_free(p, bs->bio_pool);
>  				else
>  					kfree(bio);
>  				bio = NULL;
> -- 
> 1.5.6.3

Thanks, applied.

-- 
Jens Axboe

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