diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2009-06-09 06:23:22 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-06-09 06:23:22 +0200 |
| commit | 77634f33d4078542cf1087995cced0ffdae25aa2 (patch) | |
| tree | 43d15cfb43bcfb6af567e1203419ad60ef2cb160 /block/blk-settings.c | |
| parent | Revert "block: Fix bounce limit setting in DM" (diff) | |
| download | linux-77634f33d4078542cf1087995cced0ffdae25aa2.tar.xz linux-77634f33d4078542cf1087995cced0ffdae25aa2.zip | |
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: 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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index 8d3393492891..1c4df9bf6813 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -445,7 +445,7 @@ EXPORT_SYMBOL(blk_queue_stack_limits); /** * blk_stack_limits - adjust queue_limits for stacked devices * @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 * * Description: @@ -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_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, b->seg_boundary_mask); @@ -504,7 +505,7 @@ EXPORT_SYMBOL(blk_stack_limits); /** * 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) * @offset: offset to beginning of data within component device * |