On Fri, 2011-05-27 at 12:07 -0700, Andy Grover wrote: > Signed-off-by: Andy Grover <agrover@xxxxxxxxxx> > --- Looks good. Committed as 0c9a7a81152b Thanks, --nab > drivers/target/target_core_pscsi.c | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c > index a62350d..5df329c 100644 > --- a/drivers/target/target_core_pscsi.c > +++ b/drivers/target/target_core_pscsi.c > @@ -328,10 +328,8 @@ static struct se_device *pscsi_add_device_to_list( > q = sd->request_queue; > limits = &dev_limits.limits; > limits->logical_block_size = sd->sector_size; > - limits->max_hw_sectors = (sd->host->max_sectors > queue_max_hw_sectors(q)) ? > - queue_max_hw_sectors(q) : sd->host->max_sectors; > - limits->max_sectors = (sd->host->max_sectors > queue_max_sectors(q)) ? > - queue_max_sectors(q) : sd->host->max_sectors; > + limits->max_hw_sectors = min_t(int, sd->host->max_sectors, queue_max_hw_sectors(q)); > + limits->max_sectors = min_t(int, sd->host->max_sectors, queue_max_sectors(q)); > dev_limits.hw_queue_depth = sd->queue_depth; > dev_limits.queue_depth = sd->queue_depth; > /* > -- > 1.7.1 > -- To unsubscribe from this list: send the line "unsubscribe target-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
