X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmd%2Fraid1.c;h=ac409b7d83f59fff5ec116fe59bfd125e50d8612;hb=5136dea5734cfddbc6d7ccb7ead85a3ac7ce3de2;hp=6778b7cb39bd5dd94eb719683267a6bef926e3cf;hpb=59d42c0eb1d8fdfeec18f4ff088de8084bda906b;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 6778b7cb39b..ac409b7d83f 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1935,6 +1935,9 @@ static int run(mddev_t *mddev)
 	if (!conf->r1bio_pool)
 		goto out_no_mem;
 
+	spin_lock_init(&conf->device_lock);
+	mddev->queue->queue_lock = &conf->device_lock;
+
 	rdev_for_each(rdev, tmp, mddev) {
 		disk_idx = rdev->raid_disk;
 		if (disk_idx >= mddev->raid_disks
@@ -1958,7 +1961,6 @@ static int run(mddev_t *mddev)
 	}
 	conf->raid_disks = mddev->raid_disks;
 	conf->mddev = mddev;
-	spin_lock_init(&conf->device_lock);
 	INIT_LIST_HEAD(&conf->retry_list);
 
 	spin_lock_init(&conf->resync_lock);