diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-settings.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index f1a1795a5683..aa02247d227e 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c | |||
| @@ -574,7 +574,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, | |||
| 574 | bottom = max(b->physical_block_size, b->io_min) + alignment; | 574 | bottom = max(b->physical_block_size, b->io_min) + alignment; |
| 575 | 575 | ||
| 576 | /* Verify that top and bottom intervals line up */ | 576 | /* Verify that top and bottom intervals line up */ |
| 577 | if (max(top, bottom) & (min(top, bottom) - 1)) { | 577 | if (max(top, bottom) % min(top, bottom)) { |
| 578 | t->misaligned = 1; | 578 | t->misaligned = 1; |
| 579 | ret = -1; | 579 | ret = -1; |
| 580 | } | 580 | } |
| @@ -619,7 +619,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, | |||
| 619 | 619 | ||
| 620 | /* Find lowest common alignment_offset */ | 620 | /* Find lowest common alignment_offset */ |
| 621 | t->alignment_offset = lcm(t->alignment_offset, alignment) | 621 | t->alignment_offset = lcm(t->alignment_offset, alignment) |
| 622 | & (max(t->physical_block_size, t->io_min) - 1); | 622 | % max(t->physical_block_size, t->io_min); |
| 623 | 623 | ||
| 624 | /* Verify that new alignment_offset is on a logical block boundary */ | 624 | /* Verify that new alignment_offset is on a logical block boundary */ |
| 625 | if (t->alignment_offset & (t->logical_block_size - 1)) { | 625 | if (t->alignment_offset & (t->logical_block_size - 1)) { |