Commit fef246672b009cf3f7a74e2fc9a76932ef2eeed2
Committed by
Jens Axboe
Jens Axboe
1 parent
ed680c4ad4
Exists in
master
and in
39 other branches
block: Make blk_queue_stack_limits use the new stacking interface
blk_queue_stack_limits() has been superceded by blk_stack_limits() and disk_stack_limits(). Wrap the function call for now, we'll deprecate it later. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Showing 1 changed file with 1 additions and 21 deletions Side-by-side Diff
block/blk-settings.c
| ... | ... | @@ -433,27 +433,7 @@ |
| 433 | 433 | **/ |
| 434 | 434 | void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b) |
| 435 | 435 | { |
| 436 | - /* zero is "infinity" */ | |
| 437 | - t->limits.max_sectors = min_not_zero(queue_max_sectors(t), | |
| 438 | - queue_max_sectors(b)); | |
| 439 | - | |
| 440 | - t->limits.max_hw_sectors = min_not_zero(queue_max_hw_sectors(t), | |
| 441 | - queue_max_hw_sectors(b)); | |
| 442 | - | |
| 443 | - t->limits.seg_boundary_mask = min_not_zero(queue_segment_boundary(t), | |
| 444 | - queue_segment_boundary(b)); | |
| 445 | - | |
| 446 | - t->limits.max_phys_segments = min_not_zero(queue_max_phys_segments(t), | |
| 447 | - queue_max_phys_segments(b)); | |
| 448 | - | |
| 449 | - t->limits.max_hw_segments = min_not_zero(queue_max_hw_segments(t), | |
| 450 | - queue_max_hw_segments(b)); | |
| 451 | - | |
| 452 | - t->limits.max_segment_size = min_not_zero(queue_max_segment_size(t), | |
| 453 | - queue_max_segment_size(b)); | |
| 454 | - | |
| 455 | - t->limits.logical_block_size = max(queue_logical_block_size(t), | |
| 456 | - queue_logical_block_size(b)); | |
| 436 | + blk_stack_limits(&t->limits, &b->limits, 0); | |
| 457 | 437 | |
| 458 | 438 | if (!t->queue_lock) |
| 459 | 439 | WARN_ON_ONCE(1); |