public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] fs/bio: bio_alloc_bioset: pass right object ptr to  mempool_free
@ 2009-02-16  4:15 Subhash Peddamallu
  2009-02-16  9:28 ` Jens Axboe
  0 siblings, 1 reply; 2+ messages in thread
From: Subhash Peddamallu @ 2009-02-16  4:15 UTC (permalink / raw)
  To: axboe; +Cc: linux-kernel

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@gmail.com>
---
 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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] fs/bio: bio_alloc_bioset: pass right object ptr to mempool_free
  2009-02-16  4:15 [PATCH] fs/bio: bio_alloc_bioset: pass right object ptr to mempool_free Subhash Peddamallu
@ 2009-02-16  9:28 ` Jens Axboe
  0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2009-02-16  9:28 UTC (permalink / raw)
  To: Subhash Peddamallu; +Cc: linux-kernel

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@gmail.com>
> ---
>  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


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-02-16  9:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-16  4:15 [PATCH] fs/bio: bio_alloc_bioset: pass right object ptr to mempool_free Subhash Peddamallu
2009-02-16  9:28 ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox