From be501f0054f19a7665c3b21e62e985bc673d083f Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Thu, 4 Dec 2008 08:56:35 +0100 Subject: [PATCH] --- yaml --- r: 123302 b: refs/heads/master c: 18af8b2ca34b831c32c6fa01e7ce33143c33bb63 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/blk-settings.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0ad17d8a127e..5e2593ad1937 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6f23657d3072bde6844055bbc2290e497f33fbc +refs/heads/master: 18af8b2ca34b831c32c6fa01e7ce33143c33bb63 diff --git a/trunk/block/blk-settings.c b/trunk/block/blk-settings.c index afa55e14e278..59fd05d9f1d5 100644 --- a/trunk/block/blk-settings.c +++ b/trunk/block/blk-settings.c @@ -319,9 +319,9 @@ void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b) t->max_hw_sectors = min_not_zero(t->max_hw_sectors, b->max_hw_sectors); t->seg_boundary_mask = min_not_zero(t->seg_boundary_mask, b->seg_boundary_mask); - t->max_phys_segments = min(t->max_phys_segments, b->max_phys_segments); - t->max_hw_segments = min(t->max_hw_segments, b->max_hw_segments); - t->max_segment_size = min(t->max_segment_size, b->max_segment_size); + t->max_phys_segments = min_not_zero(t->max_phys_segments, b->max_phys_segments); + t->max_hw_segments = min_not_zero(t->max_hw_segments, b->max_hw_segments); + t->max_segment_size = min_not_zero(t->max_segment_size, b->max_segment_size); t->hardsect_size = max(t->hardsect_size, b->hardsect_size); if (!t->queue_lock) WARN_ON_ONCE(1);