[PATCH v4 06/12] block: Add an explicit bio flag for bios that own their bvec
From: Kent Overstreet <hidden>
Date: 2012-07-24 20:14:42
Also in:
dm-devel, lkml
Subsystem:
block layer, filesystems (vfs and infrastructure), the rest · Maintainers:
Jens Axboe, Alexander Viro, Christian Brauner, Linus Torvalds
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 <redacted> --- fs/bio.c | 3 ++- include/linux/bio.h | 5 ----- include/linux/blk_types.h | 1 + 3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/bio.c b/fs/bio.c
index a301071..2631d0b 100644
--- a/fs/bio.c
+++ b/fs/bio.c@@ -250,7 +250,7 @@ void bio_free(struct bio *bio) return; } - if (bio_has_allocated_vec(bio)) + if (bio_flagged(bio, BIO_OWNS_VEC)) bvec_free_bs(bs, bio->bi_io_vec, BIO_POOL_IDX(bio)); if (bio_integrity(bio))
@@ -323,6 +323,7 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs) goto err_free; nr_iovecs = bvec_nr_vecs(idx); + bio->bi_flags |= 1 << BIO_OWNS_VEC; } out_set: bio->bi_flags |= idx << BIO_POOL_OFFSET;
diff --git a/include/linux/bio.h b/include/linux/bio.h
index 393c87e..484b96e 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h@@ -84,11 +84,6 @@ static inline void *bio_data(struct bio *bio) 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 */
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index fa45a12..44245af 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h@@ -111,6 +111,7 @@ struct bio { #define BIO_FS_INTEGRITY 9 /* fs owns integrity data, not block layer */ #define BIO_QUIET 10 /* Make BIO Quiet */ #define BIO_MAPPED_INTEGRITY 11/* integrity metadata has been remapped */ +#define BIO_OWNS_VEC 12 /* bio_free() should free bvec */ #define bio_flagged(bio, flag) ((bio)->bi_flags & (1 << (flag))) /*
--
1.7.7.3