Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef24667 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Jens Axboe
Browse files

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: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent ed680c4a

block/blk-settings.c

+1 −21
Original line number Diff line number Diff line
@@ -433,27 +433,7 @@ EXPORT_SYMBOL(blk_queue_io_opt); 
 **/

void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b)

{

	/* zero is "infinity" */

	t->limits.max_sectors = min_not_zero(queue_max_sectors(t),

					     queue_max_sectors(b));



	t->limits.max_hw_sectors = min_not_zero(queue_max_hw_sectors(t),

						queue_max_hw_sectors(b));



	t->limits.seg_boundary_mask = min_not_zero(queue_segment_boundary(t),

						   queue_segment_boundary(b));



	t->limits.max_phys_segments = min_not_zero(queue_max_phys_segments(t),

						   queue_max_phys_segments(b));



	t->limits.max_hw_segments = min_not_zero(queue_max_hw_segments(t),

						 queue_max_hw_segments(b));



	t->limits.max_segment_size = min_not_zero(queue_max_segment_size(t),

						  queue_max_segment_size(b));



	t->limits.logical_block_size = max(queue_logical_block_size(t),

					   queue_logical_block_size(b));

	blk_stack_limits(&t->limits, &b->limits, 0);



	if (!t->queue_lock)

		WARN_ON_ONCE(1);