VisionFive2 Linux kernel

author: Mike Snitzer <snitzer@redhat.com> 2017-04-22 17:22:09 -0400 committer: Jens Axboe <axboe@fb.com> 2017-04-23 12:59:56 -0600 commit: 2859323e35ab5fc42f351fbda23ab544eaa85945 parent: 659226eb630ff522b30d8b8a82c9e722756e6bd4

Commit Summary:

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

Diffstat:

1 file changed, 2 insertions, 1 deletion

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index ce43a8214d3e..0f891a9aff4d 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;