Skip to content

Commit

Permalink
block: Make blk_queue_stack_limits use the new stacking interface
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Martin K. Petersen authored and Jens Axboe committed Aug 1, 2009
1 parent ed680c4 commit fef2466
Showing 1 changed file with 1 addition and 21 deletions.
22 changes: 1 addition & 21 deletions block/blk-settings.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit fef2466

Please sign in to comment.