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

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

block: Switch blk_integrity_compare from bdev to gendisk 



The DM and MD integrity support now depends on being able to use
gendisks instead of block_devices when comparing integrity profiles.
Change function parameters accordingly.

Also update comparison logic so that two NULL profiles are a valid
configuration.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 0c032ab8

block/blk-integrity.c

+14 −14
Original line number Diff line number Diff line
@@ -108,51 +108,51 @@ int blk_rq_map_integrity_sg(struct request *rq, struct scatterlist *sglist) 
EXPORT_SYMBOL(blk_rq_map_integrity_sg);



/**

 * blk_integrity_compare - Compare integrity profile of two block devices

 * @bd1:	Device to compare

 * @bd2:	Device to compare

 * blk_integrity_compare - Compare integrity profile of two disks

 * @gd1:	Disk to compare

 * @gd2:	Disk to compare

 *

 * Description: Meta-devices like DM and MD need to verify that all

 * sub-devices use the same integrity format before advertising to

 * upper layers that they can send/receive integrity metadata.  This

 * function can be used to check whether two block devices have

 * function can be used to check whether two gendisk devices have

 * compatible integrity formats.

 */

int blk_integrity_compare(struct block_device *bd1, struct block_device *bd2)

int blk_integrity_compare(struct gendisk *gd1, struct gendisk *gd2)

{

	struct blk_integrity *b1 = bd1->bd_disk->integrity;

	struct blk_integrity *b2 = bd2->bd_disk->integrity;

	struct blk_integrity *b1 = gd1->integrity;

	struct blk_integrity *b2 = gd2->integrity;



	BUG_ON(bd1->bd_disk == NULL);

	BUG_ON(bd2->bd_disk == NULL);

	if (!b1 && !b2)

		return 0;



	if (!b1 || !b2)

		return 0;

		return -1;



	if (b1->sector_size != b2->sector_size) {

		printk(KERN_ERR "%s: %s/%s sector sz %u != %u\n", __func__,

		       bd1->bd_disk->disk_name, bd2->bd_disk->disk_name,

		       gd1->disk_name, gd2->disk_name,

		       b1->sector_size, b2->sector_size);

		return -1;

	}



	if (b1->tuple_size != b2->tuple_size) {

		printk(KERN_ERR "%s: %s/%s tuple sz %u != %u\n", __func__,

		       bd1->bd_disk->disk_name, bd2->bd_disk->disk_name,

		       gd1->disk_name, gd2->disk_name,

		       b1->tuple_size, b2->tuple_size);

		return -1;

	}



	if (b1->tag_size && b2->tag_size && (b1->tag_size != b2->tag_size)) {

		printk(KERN_ERR "%s: %s/%s tag sz %u != %u\n", __func__,

		       bd1->bd_disk->disk_name, bd2->bd_disk->disk_name,

		       gd1->disk_name, gd2->disk_name,

		       b1->tag_size, b2->tag_size);

		return -1;

	}



	if (strcmp(b1->name, b2->name)) {

		printk(KERN_ERR "%s: %s/%s type %s != %s\n", __func__,

		       bd1->bd_disk->disk_name, bd2->bd_disk->disk_name,

		       gd1->disk_name, gd2->disk_name,

		       b1->name, b2->name);

		return -1;

	}

include/linux/blkdev.h

+1 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ struct blk_integrity { 


extern int blk_integrity_register(struct gendisk *, struct blk_integrity *);

extern void blk_integrity_unregister(struct gendisk *);

extern int blk_integrity_compare(struct block_device *, struct block_device *);

extern int blk_integrity_compare(struct gendisk *, struct gendisk *);

extern int blk_rq_map_integrity_sg(struct request *, struct scatterlist *);

extern int blk_rq_count_integrity_sg(struct request *);