summaryrefslogtreecommitdiff
path: root/fs/bio.c
diff options
context:
space:
mode:
authorKent Overstreet <koverstreet@google.com>2012-05-25 13:03:11 -0700
committerKent Overstreet <koverstreet@google.com>2013-03-23 14:26:33 -0700
commita38352e0ac02dbbd4fa464dc22d1352b5fbd06fd (patch)
treecae9097633ac86ab3b32ee8db9dc2e847929ad06 /fs/bio.c
parenta07876064a0b73ab5ef1ebcf14b1cf0231c07858 (diff)
downloadlwn-a38352e0ac02dbbd4fa464dc22d1352b5fbd06fd.tar.gz
lwn-a38352e0ac02dbbd4fa464dc22d1352b5fbd06fd.zip
block: Add an explicit bio flag for bios that own their bvec
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>
Diffstat (limited to 'fs/bio.c')
-rw-r--r--fs/bio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/bio.c b/fs/bio.c
index e545a440d376..9238a54b562c 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -252,7 +252,7 @@ static void bio_free(struct bio *bio)
__bio_free(bio);
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));
/*
@@ -451,6 +451,8 @@ struct bio *bio_alloc_bioset(gfp_t gfp_mask, int nr_iovecs, struct bio_set *bs)
if (unlikely(!bvl))
goto err_free;
+
+ bio->bi_flags |= 1 << BIO_OWNS_VEC;
} else if (nr_iovecs) {
bvl = bio->bi_inline_vecs;
}