diff options
| author | Christoph Hellwig <hch@lst.de> | 2026-03-16 17:11:31 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2026-03-17 19:27:14 -0600 |
| commit | e80fd7a08940093aad5ea247a42046b57709a7bd (patch) | |
| tree | b8e67605b5a74d8f6423720602525c40699d77fc /block | |
| parent | b520c4eef83dd406591431f936de0908c3ed7fb9 (diff) | |
| download | linux-next-history-e80fd7a08940093aad5ea247a42046b57709a7bd.tar.gz | |
block: remove bvec_free
bvec_free is only called by bio_free, so inline it there.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> -ck
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://patch.msgid.link/20260316161144.1607877-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/bio.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/block/bio.c b/block/bio.c index 5982bf069cef3..b58bce6b5feaa 100644 --- a/block/bio.c +++ b/block/bio.c @@ -161,17 +161,6 @@ out: mutex_unlock(&bio_slab_lock); } -static void bvec_free(struct mempool *pool, struct bio_vec *bv, - unsigned short nr_vecs) -{ - BUG_ON(nr_vecs > BIO_MAX_VECS); - - if (nr_vecs == BIO_MAX_VECS) - mempool_free(bv, pool); - else if (nr_vecs > BIO_INLINE_VECS) - kmem_cache_free(biovec_slab(nr_vecs)->slab, bv); -} - /* * Make the first allocation restricted and don't dump info on allocation * failures, since we'll fall back to the mempool in case of failure. @@ -203,9 +192,14 @@ static void bio_free(struct bio *bio) void *p = bio; WARN_ON_ONCE(!bs); + WARN_ON_ONCE(bio->bi_max_vecs > BIO_MAX_VECS); bio_uninit(bio); - bvec_free(&bs->bvec_pool, bio->bi_io_vec, bio->bi_max_vecs); + if (bio->bi_max_vecs == BIO_MAX_VECS) + mempool_free(bio->bi_io_vec, &bs->bvec_pool); + else if (bio->bi_max_vecs > BIO_INLINE_VECS) + kmem_cache_free(biovec_slab(bio->bi_max_vecs)->slab, + bio->bi_io_vec); mempool_free(p - bs->front_pad, &bs->bio_pool); } @@ -561,7 +555,7 @@ struct bio *bio_alloc_bioset(struct block_device *bdev, unsigned short nr_vecs, /* * Upgrade nr_vecs to take full advantage of the allocation. - * We also rely on this in bvec_free(). + * We also rely on this in bio_free(). */ nr_vecs = bvs->nr_vecs; bvecs = kmem_cache_alloc(bvs->slab, gfp); |