From 8ad7599b8c9e32c2319c19a1366909f1500591b6 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 29 Apr 2008 19:12:35 +0200 Subject: [PATCH] --- yaml --- r: 94869 b: refs/heads/master c: c9a3f6d6f541915bd7451fc7e9cb23a8b33a3ab8 h: refs/heads/master i: 94867: 60c574cc28beed7add77fd30004a343a0fd1242a v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-table.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0bb142a6aded..4256c33ba8c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a217656cb26c5b7ebe9900354b2e808c1f74b470 +refs/heads/master: c9a3f6d6f541915bd7451fc7e9cb23a8b33a3ab8 diff --git a/trunk/drivers/md/dm-table.c b/trunk/drivers/md/dm-table.c index 73326e7c54bf..94116eaf4709 100644 --- a/trunk/drivers/md/dm-table.c +++ b/trunk/drivers/md/dm-table.c @@ -873,13 +873,11 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q) q->max_hw_sectors = t->limits.max_hw_sectors; q->seg_boundary_mask = t->limits.seg_boundary_mask; q->bounce_pfn = t->limits.bounce_pfn; - /* XXX: the below will probably go bug. must ensure there can be no - * concurrency on queue_flags, and use the unlocked versions... - */ + if (t->limits.no_cluster) - queue_flag_clear(QUEUE_FLAG_CLUSTER, q); + queue_flag_clear_unlocked(QUEUE_FLAG_CLUSTER, q); else - queue_flag_set(QUEUE_FLAG_CLUSTER, q); + queue_flag_set_unlocked(QUEUE_FLAG_CLUSTER, q); }