From c8487744638275ffb05b792fa36ee455cd8f342d Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Mon, 22 Jun 2009 10:12:32 +0100 Subject: [PATCH] --- yaml --- r: 154269 b: refs/heads/master c: 1197764e403d97231eb6da2b1e16f511a7fd3101 h: refs/heads/master i: 154267: 2c6e5d2f6df537180872594e74c9e0fb89452bb9 v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-table.c | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 91f195a13576..b8331b45eebb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ab97588fb266187b88d1ad893251c94388f18ba +refs/heads/master: 1197764e403d97231eb6da2b1e16f511a7fd3101 diff --git a/trunk/drivers/md/dm-table.c b/trunk/drivers/md/dm-table.c index 41ec2bf9fbe9..267817edc844 100644 --- a/trunk/drivers/md/dm-table.c +++ b/trunk/drivers/md/dm-table.c @@ -956,17 +956,9 @@ static void dm_table_set_integrity(struct dm_table *t) void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q) { /* - * Make sure we obey the optimistic sub devices - * restrictions. + * Copy table's limits to the DM device's request_queue */ - blk_queue_max_sectors(q, t->limits.max_sectors); - blk_queue_max_phys_segments(q, t->limits.max_phys_segments); - blk_queue_max_hw_segments(q, t->limits.max_hw_segments); - blk_queue_logical_block_size(q, t->limits.logical_block_size); - blk_queue_max_segment_size(q, t->limits.max_segment_size); - blk_queue_max_hw_sectors(q, t->limits.max_hw_sectors); - blk_queue_segment_boundary(q, t->limits.seg_boundary_mask); - blk_queue_bounce_limit(q, t->limits.bounce_pfn); + q->limits = t->limits; if (t->limits.no_cluster) queue_flag_clear_unlocked(QUEUE_FLAG_CLUSTER, q);