Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[linux-2.6] / drivers / md / linear.c

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 0b8511776b3e75276e9a472ea759e0aa304fff48..10748240cb2fde2bd8942dbb19e300cc6c32961c 100644 (file)
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -250,6 +250,7 @@ static int linear_run (mddev_t *mddev)
 {
        linear_conf_t *conf;
 
+       mddev->queue->queue_lock = &mddev->queue->__queue_lock;
        conf = linear_conf(mddev, mddev->raid_disks);
 
        if (!conf)