Merge ../torvalds-2.6/

[pandora-kernel.git] / drivers / md / raid1.c

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index ba7f5f2..a93ca47 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1703,19 +1703,19 @@ static int raid1_reshape(mddev_t *mddev, int raid_disks)
        return 0;
 }
 
-void raid1_quiesce(mddev_t *mddev, int state)
+static void raid1_quiesce(mddev_t *mddev, int state)
 {
        conf_t *conf = mddev_to_conf(mddev);
 
        switch(state) {
-       case 0:
+       case 1:
                spin_lock_irq(&conf->resync_lock);
                conf->barrier++;
                wait_event_lock_irq(conf->wait_idle, !conf->nr_pending,
                                    conf->resync_lock, raid1_unplug(mddev->queue));
                spin_unlock_irq(&conf->resync_lock);
                break;
-       case 1:
+       case 0:
                spin_lock_irq(&conf->resync_lock);
                conf->barrier--;
                spin_unlock_irq(&conf->resync_lock);