diff options
| author |   Paul Mackerras <paulus@samba.org> | 2008-05-16 23:13:42 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 23:13:42 +1000 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/md/raid1.c | |
| parent | [POWERPC] Fix sparse warnings in arch/powerpc/platforms/pseries (diff) | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff) | |
| download | linux-dev-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.tar.xz linux-dev-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.zip | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 6778b7cb39bd..ac409b7d83f5 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); |