[PATCH 4/4] block: remove the fs_bio_integrity_alloc return value
Christoph Hellwig <[email protected]>
| Newsgroups | org.kernel.vger.linux-block |
|---|---|
| Message-ID | <[email protected]> |
Not used anymore. Signed-off-by: Christoph Hellwig <[email protected]> --- block/bio-integrity-fs.c | 5 ++--- include/linux/bio-integrity.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/block/bio-integrity-fs.c b/block/bio-integrity-fs.c index 5ad43476a3c7..1be80fdf1b92 100644 --- a/block/bio-integrity-fs.c +++ b/block/bio-integrity-fs.c @@ -14,14 +14,14 @@ struct fs_bio_integrity_buf { static struct kmem_cache *fs_bio_integrity_cache; static mempool_t fs_bio_integrity_pool; -unsigned int fs_bio_integrity_alloc(struct bio *bio) +void fs_bio_integrity_alloc(struct bio *bio) { struct fs_bio_integrity_buf *iib; unsigned int action; action = bio_integrity_action(bio); if (!action) - return 0; + return; iib = mempool_alloc(&fs_bio_integrity_pool, GFP_NOFS); bio_integrity_init(bio, &iib->bip, &iib->bvec, 1); @@ -29,7 +29,6 @@ unsigned int fs_bio_integrity_alloc(struct bio *bio) bio_integrity_alloc_buf(bio, GFP_NOFS, action & BI_ACT_ZERO); if (action & BI_ACT_CHECK) bio_integrity_setup_default(bio); - return action; } void fs_bio_integrity_free(struct bio *bio) diff --git a/include/linux/bio-integrity.h b/include/linux/bio-integrity.h index 0ea2a8bf7efb..f6fc6c66268f 100644 --- a/include/linux/bio-integrity.h +++ b/include/linux/bio-integrity.h @@ -148,7 +148,7 @@ void bio_integrity_alloc_buf(struct bio *bio, gfp_t gfp, bool zero_buffer); void bio_integrity_free_buf(struct bio_integrity_payload *bip); void bio_integrity_setup_default(struct bio *bio); -unsigned int fs_bio_integrity_alloc(struct bio *bio); +void fs_bio_integrity_alloc(struct bio *bio); void fs_bio_integrity_free(struct bio *bio); void fs_bio_integrity_generate(struct bio *bio); int fs_bio_integrity_verify(struct bio *bio, sector_t sector, -- 2.53.0