Pull platform-drivers into test branch

[linux-2.6-omap-h63xx.git] / drivers / md / raid1.c

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 656fae912fe3550e06a17f14a851f05a7dd63fd2..b30f74be3982ce8fbfad91a5204cc7e49799479d 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1736,7 +1736,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
                /* take from bio_init */
                bio->bi_next = NULL;
                bio->bi_flags |= 1 << BIO_UPTODATE;
-               bio->bi_rw = 0;
+               bio->bi_rw = READ;
                bio->bi_vcnt = 0;
                bio->bi_idx = 0;
                bio->bi_phys_segments = 0;
@@ -1951,6 +1951,7 @@ static int run(mddev_t *mddev)
                    !test_bit(In_sync, &disk->rdev->flags)) {
                        disk->head_position = 0;
                        mddev->degraded++;
+                       conf->fullsync = 1;
                }
        }
        if (mddev->degraded == conf->raid_disks) {