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

Commit 359f6427 authored by Greg Edwards's avatar Greg Edwards Committed by Jens Axboe
Browse files

block: move bio_integrity_{intervals,bytes} into blkdev.h 



This allows bio_integrity_bytes() to be called from drivers instead of
open coding it.

Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Edwards <gedwards@ddn.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d3df0ac0

block/bio-integrity.c

+0 −22
Original line number Diff line number Diff line
@@ -159,28 +159,6 @@ int bio_integrity_add_page(struct bio *bio, struct page *page, 
}

EXPORT_SYMBOL(bio_integrity_add_page);



/**

 * bio_integrity_intervals - Return number of integrity intervals for a bio

 * @bi:		blk_integrity profile for device

 * @sectors:	Size of the bio in 512-byte sectors

 *

 * Description: The block layer calculates everything in 512 byte

 * sectors but integrity metadata is done in terms of the data integrity

 * interval size of the storage device.  Convert the block layer sectors

 * to the appropriate number of integrity intervals.

 */

static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,

						   unsigned int sectors)

{

	return sectors >> (bi->interval_exp - 9);

}



static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi,

					       unsigned int sectors)

{

	return bio_integrity_intervals(bi, sectors) * bi->tuple_size;

}



/**

 * bio_integrity_process - Process integrity metadata for a bio

 * @bio:	bio to generate/verify integrity metadata for

include/linux/blkdev.h

+34 −0
Original line number Diff line number Diff line
@@ -1865,6 +1865,28 @@ static inline bool integrity_req_gap_front_merge(struct request *req, 
				bip_next->bip_vec[0].bv_offset);

}



/**

 * bio_integrity_intervals - Return number of integrity intervals for a bio

 * @bi:		blk_integrity profile for device

 * @sectors:	Size of the bio in 512-byte sectors

 *

 * Description: The block layer calculates everything in 512 byte

 * sectors but integrity metadata is done in terms of the data integrity

 * interval size of the storage device.  Convert the block layer sectors

 * to the appropriate number of integrity intervals.

 */

static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,

						   unsigned int sectors)

{

	return sectors >> (bi->interval_exp - 9);

}



static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi,

					       unsigned int sectors)

{

	return bio_integrity_intervals(bi, sectors) * bi->tuple_size;

}



#else /* CONFIG_BLK_DEV_INTEGRITY */



struct bio;
@@ -1938,6 +1960,18 @@ static inline bool integrity_req_gap_front_merge(struct request *req, 
	return false;

}



static inline unsigned int bio_integrity_intervals(struct blk_integrity *bi,

						   unsigned int sectors)

{

	return 0;

}



static inline unsigned int bio_integrity_bytes(struct blk_integrity *bi,

					       unsigned int sectors)

{

	return 0;

}



#endif /* CONFIG_BLK_DEV_INTEGRITY */



struct block_device_operations {