Commit 77634f33 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Jens Axboe

block: Add missing bounce_pfn stacking and fix comments

DM no longer needs to set limits explicitly when calling blk_stack_limits.
Let the latter automatically deal with bounce_pfn scaling.

Fix kerneldoc variable names.
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 9df1bb9b
...@@ -445,7 +445,7 @@ EXPORT_SYMBOL(blk_queue_stack_limits); ...@@ -445,7 +445,7 @@ EXPORT_SYMBOL(blk_queue_stack_limits);
/** /**
* blk_stack_limits - adjust queue_limits for stacked devices * blk_stack_limits - adjust queue_limits for stacked devices
* @t: the stacking driver limits (top) * @t: the stacking driver limits (top)
* @bdev: the underlying queue limits (bottom) * @b: the underlying queue limits (bottom)
* @offset: offset to beginning of data within component device * @offset: offset to beginning of data within component device
* *
* Description: * Description:
...@@ -458,6 +458,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, ...@@ -458,6 +458,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
{ {
t->max_sectors = min_not_zero(t->max_sectors, b->max_sectors); t->max_sectors = min_not_zero(t->max_sectors, b->max_sectors);
t->max_hw_sectors = min_not_zero(t->max_hw_sectors, b->max_hw_sectors); t->max_hw_sectors = min_not_zero(t->max_hw_sectors, b->max_hw_sectors);
t->bounce_pfn = min_not_zero(t->bounce_pfn, b->bounce_pfn);
t->seg_boundary_mask = min_not_zero(t->seg_boundary_mask, t->seg_boundary_mask = min_not_zero(t->seg_boundary_mask,
b->seg_boundary_mask); b->seg_boundary_mask);
...@@ -504,7 +505,7 @@ EXPORT_SYMBOL(blk_stack_limits); ...@@ -504,7 +505,7 @@ EXPORT_SYMBOL(blk_stack_limits);
/** /**
* disk_stack_limits - adjust queue limits for stacked drivers * disk_stack_limits - adjust queue limits for stacked drivers
* @t: MD/DM gendisk (top) * @disk: MD/DM gendisk (top)
* @bdev: the underlying block device (bottom) * @bdev: the underlying block device (bottom)
* @offset: offset to beginning of data within component device * @offset: offset to beginning of data within component device
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment