From 9a7b02a3787dde6b1a241ffafde9f1165527b377 Mon Sep 17 00:00:00 2001 From: "Martin K. Petersen" Date: Tue, 9 Jun 2009 06:23:22 +0200 Subject: [PATCH] --- yaml --- r: 147086 b: refs/heads/master c: 77634f33d4078542cf1087995cced0ffdae25aa2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-settings.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e7f72621b3f5..a24438137f44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9df1bb9b516daeece159ab7fb262d01a0359247c +refs/heads/master: 77634f33d4078542cf1087995cced0ffdae25aa2 diff --git a/trunk/block/blk-settings.c b/trunk/block/blk-settings.c index 8d3393492891..1c4df9bf6813 100644 --- a/trunk/block/blk-settings.c +++ b/trunk/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 *