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

Commit 2859323e authored by Mike Snitzer's avatar Mike Snitzer Committed by Jens Axboe
Browse files

block: fix blk_integrity_register to use template's interval_exp if not 0 



When registering an integrity profile: if the template's interval_exp is
not 0 use it, otherwise use the ilog2() of logical block size of the
provided gendisk.

This fixes a long-standing DM linear target bug where it cannot pass
integrity data to the underlying device if its logical block size
conflicts with the underlying device's logical block size.

Cc: stable@vger.kernel.org
Reported-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 659226eb

block/blk-integrity.c

+2 −1
Original line number Diff line number Diff line
@@ -412,7 +412,8 @@ void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template 


	bi->flags = BLK_INTEGRITY_VERIFY | BLK_INTEGRITY_GENERATE |

		template->flags;

	bi->interval_exp = ilog2(queue_logical_block_size(disk->queue));

	bi->interval_exp = template->interval_exp ? :

		ilog2(queue_logical_block_size(disk->queue));

	bi->profile = template->profile ? template->profile : &nop_profile;

	bi->tuple_size = template->tuple_size;

	bi->tag_size = template->tag_size;