forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

block: Add an explicit bio flag for bios that own their bvec

Browse source 
This is for the new bio splitting code. When we split a bio, if the
split occured on a bvec boundry we reuse the bvec for the new bio. But
that means bio_free() can't free it, hence the explicit flag.

Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
Acked-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Kent Overstreet 2012-05-25 13:03:11 -07:00
commit a38352e0ac
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fs/bio.c
View file

@ -252,7 +252,7 @@ static void bio_free(struct bio *bio)
__bio_free(bio); __bio_free(bio);
if (bs) { if (bs) {
if (bio_has_allocated_vec(bio)) if (bio_flagged(bio, BIO_OWNS_VEC))
bvec_free(bs->bvec_pool, bio->bi_io_vec, BIO_POOL_IDX(bio)); bvec_free(bs->bvec_pool, bio->bi_io_vec, BIO_POOL_IDX(bio));
/* /*
@ -451,6 +451,8 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs)
if (unlikely(!bvl)) if (unlikely(!bvl))
goto err_free; goto err_free;
bio->bi_flags |= 1 << BIO_OWNS_VEC;
} else if (nr_iovecs) { } else if (nr_iovecs) {
bvl = bio->bi_inline_vecs; bvl = bio->bi_inline_vecs;
} }

5
include/linux/bio.h
View file

@ -85,11 +85,6 @@ static inline void *bio_data(struct bio *bio)
return NULL; return NULL;
} }
static inline int bio_has_allocated_vec(struct bio *bio)
{
return bio->bi_io_vec && bio->bi_io_vec != bio->bi_inline_vecs;
}
/* /*
* will die * will die
*/ */

1
include/linux/blk_types.h
View file

@ -117,6 +117,7 @@ struct bio {
* BIO_POOL_IDX() * BIO_POOL_IDX()
*/ */
#define BIO_RESET_BITS 12 #define BIO_RESET_BITS 12
#define BIO_OWNS_VEC 12 /* bio_free() should free bvec */
#define bio_flagged(bio, flag) ((bio)->bi_flags & (1 << (flag))) #define bio_flagged(bio, flag) ((bio)->bi_flags & (1 << (flag)))