Commit b93ef453 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: use bvec_virt in bio_integrity_{process,free} 



Use the bvec_virt helper to clean up the bio integrity processing a
little bit.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@kernel.org>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20210804095634.460779-3-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1113f0b6

block/bio-integrity.c

+2 −5
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ void bio_integrity_free(struct bio *bio) 
	struct bio_set *bs = bio->bi_pool;



	if (bip->bip_flags & BIP_BLOCK_INTEGRITY)

		kfree(page_address(bip->bip_vec->bv_page) +

		      bip->bip_vec->bv_offset);

		kfree(bvec_virt(bip->bip_vec));



	__bio_integrity_free(bs, bip);

	bio->bi_integrity = NULL;
@@ -163,13 +162,11 @@ static blk_status_t bio_integrity_process(struct bio *bio, 
	struct bio_vec bv;

	struct bio_integrity_payload *bip = bio_integrity(bio);

	blk_status_t ret = BLK_STS_OK;

	void *prot_buf = page_address(bip->bip_vec->bv_page) +

		bip->bip_vec->bv_offset;



	iter.disk_name = bio->bi_bdev->bd_disk->disk_name;

	iter.interval = 1 << bi->interval_exp;

	iter.seed = proc_iter->bi_sector;

	iter.prot_buf = prot_buf;

	iter.prot_buf = bvec_virt(bip->bip_vec);



	__bio_for_each_segment(bv, bio, bviter, *proc_iter) {

		void *kaddr = bvec_kmap_local(&bv);