diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2009-07-31 11:49:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-08-01 10:24:35 +0200 |
| commit | fef246672b009cf3f7a74e2fc9a76932ef2eeed2 (patch) | |
| tree | 41d7dcf1ece710d6e4bf387dee140e47f66e9011 /block/blk-settings.c | |
| parent | ed680c4ad478d0fee9740f7d029087f181346564 (diff) | |
| download | linux-stable-fef246672b009cf3f7a74e2fc9a76932ef2eeed2.tar.gz linux-stable-fef246672b009cf3f7a74e2fc9a76932ef2eeed2.tar.bz2 linux-stable-fef246672b009cf3f7a74e2fc9a76932ef2eeed2.zip | |
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>
Diffstat (limited to 'block/blk-settings.c')
| -rw-r--r-- | block/blk-settings.c | 22 |
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); **/ 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); |