Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f9378fa authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Jens Axboe
Browse files

block: Remove bip_buf 



bip_buf is not really needed so we can remove it.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 8492b68b

block/bio-integrity.c

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



	if (bip->bip_owns_buf)

		kfree(bip->bip_buf);

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

		      bip->bip_vec->bv_offset);



	if (bs) {

		if (bip->bip_slab != BIO_POOL_NONE)
@@ -219,14 +220,16 @@ static int bio_integrity_generate_verify(struct bio *bio, int operate) 
	struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);

	struct blk_integrity_exchg bix;

	struct bio_vec *bv;

	struct bio_integrity_payload *bip = bio_integrity(bio);

	sector_t sector;

	unsigned int sectors, ret = 0, i;

	void *prot_buf = bio_integrity(bio)->bip_buf;

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

		bip->bip_vec->bv_offset;



	if (operate)

		sector = bio->bi_iter.bi_sector;

	else

		sector = bio_integrity(bio)->bip_iter.bi_sector;

		sector = bip->bip_iter.bi_sector;



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

	bix.sector_size = bi->sector_size;
@@ -321,7 +324,6 @@ int bio_integrity_prep(struct bio *bio) 
	}



	bip->bip_owns_buf = 1;

	bip->bip_buf = buf;

	bip->bip_iter.bi_size = len;

	bip->bip_iter.bi_sector = bio->bi_iter.bi_sector;

include/linux/bio.h

+0 −3
Original line number Diff line number Diff line
@@ -310,9 +310,6 @@ struct bio_integrity_payload { 


	struct bvec_iter	bip_iter;



	/* kill - should just use bip_vec */

	void			*bip_buf;	/* generated integrity data */



	bio_end_io_t		*bip_end_io;	/* saved I/O completion fn */



	unsigned short		bip_slab;	/* slab the bip came from */