Commit be1515ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.10-2020-12-05' of git://git.kernel.dk/linux-block 

Pull block fix from Jens Axboe:
 "Single fix for an issue with chunk_sectors and stacked devices"

* tag 'block-5.10-2020-12-05' of git://git.kernel.dk/linux-block:
  block: use gcd() to fix chunk_sectors limit stacking
parents 619ca266 7e7986f9

block/blk-settings.c

+4 −1
Original line number Diff line number Diff line
@@ -547,7 +547,10 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 


	t->io_min = max(t->io_min, b->io_min);

	t->io_opt = lcm_not_zero(t->io_opt, b->io_opt);

	t->chunk_sectors = lcm_not_zero(t->chunk_sectors, b->chunk_sectors);



	/* Set non-power-of-2 compatible chunk_sectors boundary */

	if (b->chunk_sectors)

		t->chunk_sectors = gcd(t->chunk_sectors, b->chunk_sectors);



	/* Physical block size a multiple of the logical block size? */

	if (t->physical_block_size & (t->logical_block_size - 1)) {