diff options
| author |   Christoph Hellwig <hch@lst.de> | 2021-02-02 18:19:19 +0100 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2021-02-08 08:33:15 -0700 |
| commit | dc0b8a57ad7b05036fcb19a5bf0319467597e67a (patch) | |
| tree | f1b7d4e71d45c0822ee0230d1bdedb29e4f7dcae /block/bio-integrity.c | |
| parent | block: fix memory leak of bvec (diff) | |
| download | linux-dev-dc0b8a57ad7b05036fcb19a5bf0319467597e67a.tar.xz linux-dev-dc0b8a57ad7b05036fcb19a5bf0319467597e67a.zip | |
block: reuse BIO_INLINE_VECS for integrity bvecs
bvec_alloc always uses biovec_slabs, and thus always needs to use the
same number of inline vecs. Share a single definition for the data
and integrity bvecs.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bio-integrity.c')
| -rw-r--r-- | block/bio-integrity.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/block/bio-integrity.c b/block/bio-integrity.c index c3e5abcfdc98..19617fa326c3 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -14,8 +14,6 @@ #include <linux/slab.h> #include "blk.h" -#define BIP_INLINE_VECS 4 - static struct kmem_cache *bip_slab; static struct workqueue_struct *kintegrityd_wq; @@ -63,7 +61,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, inline_vecs = nr_vecs; } else { bip = mempool_alloc(&bs->bio_integrity_pool, gfp_mask); - inline_vecs = BIP_INLINE_VECS; + inline_vecs = BIO_INLINE_VECS; } if (unlikely(!bip)) @@ -470,6 +468,6 @@ void __init bio_integrity_init(void) bip_slab = kmem_cache_create("bio_integrity_payload", sizeof(struct bio_integrity_payload) + - sizeof(struct bio_vec) * BIP_INLINE_VECS, + sizeof(struct bio_vec) * BIO_INLINE_VECS, 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); } |