summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2008-04-29 19:12:35 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 19:21:12 +0200
commitc9a3f6d6f541915bd7451fc7e9cb23a8b33a3ab8 (patch)
tree3d6d54e43b4bd7d5409bc47837e72b45788da1d4 /drivers
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff)
downloadlinux-c9a3f6d6f541915bd7451fc7e9cb23a8b33a3ab8.tar.xz
linux-c9a3f6d6f541915bd7451fc7e9cb23a8b33a3ab8.zip
dm: use unlocked variants of queue flag check/set
dm.c already provides mutual exclusion through ->map_lock. Signed-off-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--drivers/md/dm-table.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 73326e7c54bf..94116eaf4709 100644
--- a/drivers/md/dm-table.c
+++ b/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);
}