| Message ID | 20170422212209.GA49088@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Mike, > 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. Looks good! Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
On 04/22/2017 03:22 PM, Mike Snitzer wrote: > 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: Mikulas Patocka <mpatocka@redhat.com> > Signed-off-by: Mike Snitzer <snitzer@redhat.com> > --- > block/blk-integrity.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > Jens, please feel free to pick this up for 4.12 and I'll just make the > dm-integrity commit Depends-on it once you've staged it. OK, I'll commit it. I'll send out my pull request as soon as the merge window opens, so you should not have any delays.
diff --git a/block/blk-integrity.c b/block/blk-integrity.c index 9f0ff5b..d6e1b9a 100644 --- a/block/blk-integrity.c +++ b/block/blk-integrity.c @@ -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;
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: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> --- block/blk-integrity.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Jens, please feel free to pick this up for 4.12 and I'll just make the dm-integrity commit Depends-on it once you've staged it.