aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/blk-settings.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 8a3ea3bba10d..8e86e2d2b147 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -433,27 +433,7 @@ EXPORT_SYMBOL(blk_queue_io_opt);
433 **/ 433 **/
434void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b) 434void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b)
435{ 435{
436 /* zero is "infinity" */ 436 blk_stack_limits(&t->limits, &b->limits, 0);
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));
457 437
458 if (!t->queue_lock) 438 if (!t->queue_lock)
459 WARN_ON_ONCE(1); 439 WARN_ON_ONCE(1);