vserver 2.0 rc7

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

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 060c6a2..1db5de5 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -34,7 +34,7 @@ static mdk_personality_t raid1_personality;
 static void unplug_slaves(mddev_t *mddev);
 
 
-static void * r1bio_pool_alloc(int gfp_flags, void *data)
+static void * r1bio_pool_alloc(unsigned int __nocast gfp_flags, void *data)
 {
        struct pool_info *pi = data;
        r1bio_t *r1_bio;
@@ -61,7 +61,7 @@ static void r1bio_pool_free(void *r1_bio, void *data)
 #define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE)
 #define RESYNC_WINDOW (2048*1024)
 
-static void * r1buf_pool_alloc(int gfp_flags, void *data)
+static void * r1buf_pool_alloc(unsigned int __nocast gfp_flags, void *data)
 {
        struct pool_info *pi = data;
        struct page *page;
@@ -338,6 +338,7 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio)
        int new_disk = conf->last_used, disk = new_disk;
        const int sectors = r1_bio->sectors;
        sector_t new_distance, current_distance;
+       mdk_rdev_t *new_rdev, *rdev;
 
        rcu_read_lock();
        /*
@@ -345,13 +346,14 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio)
         * device if no resync is going on, or below the resync window.
         * We take the first readable disk when above the resync window.
         */
+ retry:
        if (conf->mddev->recovery_cp < MaxSector &&
            (this_sector + sectors >= conf->next_resync)) {
                /* Choose the first operation device, for consistancy */
                new_disk = 0;
 
-               while (!conf->mirrors[new_disk].rdev ||
-                      !conf->mirrors[new_disk].rdev->in_sync) {
+               while ((new_rdev=conf->mirrors[new_disk].rdev) == NULL ||
+                      !new_rdev->in_sync) {
                        new_disk++;
                        if (new_disk == conf->raid_disks) {
                                new_disk = -1;
@@ -363,8 +365,8 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio)
 
 
        /* make sure the disk is operational */
-       while (!conf->mirrors[new_disk].rdev ||
-              !conf->mirrors[new_disk].rdev->in_sync) {
+       while ((new_rdev=conf->mirrors[new_disk].rdev) == NULL ||
+              !new_rdev->in_sync) {
                if (new_disk <= 0)
                        new_disk = conf->raid_disks;
                new_disk--;
@@ -393,18 +395,20 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio)
                        disk = conf->raid_disks;
                disk--;
 
-               if (!conf->mirrors[disk].rdev ||
-                   !conf->mirrors[disk].rdev->in_sync)
+               if ((rdev=conf->mirrors[disk].rdev) == NULL ||
+                   !rdev->in_sync)
                        continue;
 
-               if (!atomic_read(&conf->mirrors[disk].rdev->nr_pending)) {
+               if (!atomic_read(&rdev->nr_pending)) {
                        new_disk = disk;
+                       new_rdev = rdev;
                        break;
                }
                new_distance = abs(this_sector - conf->mirrors[disk].head_position);
                if (new_distance < current_distance) {
                        current_distance = new_distance;
                        new_disk = disk;
+                       new_rdev = rdev;
                }
        } while (disk != conf->last_used);
 
@@ -414,7 +418,14 @@ rb_out:
        if (new_disk >= 0) {
                conf->next_seq_sect = this_sector + sectors;
                conf->last_used = new_disk;
-               atomic_inc(&conf->mirrors[new_disk].rdev->nr_pending);
+               atomic_inc(&new_rdev->nr_pending);
+               if (!new_rdev->in_sync) {
+                       /* cannot risk returning a device that failed
+                        * before we inc'ed nr_pending
+                        */
+                       atomic_dec(&new_rdev->nr_pending);
+                       goto retry;
+               }
        }
        rcu_read_unlock();
 
@@ -512,6 +523,7 @@ static int make_request(request_queue_t *q, struct bio * bio)
        r1bio_t *r1_bio;
        struct bio *read_bio;
        int i, disks;
+       mdk_rdev_t *rdev;
 
        /*
         * Register the new request and wait if the reconstruction
@@ -585,10 +597,14 @@ static int make_request(request_queue_t *q, struct bio * bio)
        disks = conf->raid_disks;
        rcu_read_lock();
        for (i = 0;  i < disks; i++) {
-               if (conf->mirrors[i].rdev &&
-                   !conf->mirrors[i].rdev->faulty) {
-                       atomic_inc(&conf->mirrors[i].rdev->nr_pending);
-                       r1_bio->bios[i] = bio;
+               if ((rdev=conf->mirrors[i].rdev) != NULL &&
+                   !rdev->faulty) {
+                       atomic_inc(&rdev->nr_pending);
+                       if (rdev->faulty) {
+                               atomic_dec(&rdev->nr_pending);
+                               r1_bio->bios[i] = NULL;
+                       } else
+                               r1_bio->bios[i] = bio;
                } else
                        r1_bio->bios[i] = NULL;
        }
@@ -781,7 +797,7 @@ static int raid1_remove_disk(mddev_t *mddev, int number)
                        goto abort;
                }
                p->rdev = NULL;
-               synchronize_kernel();
+               synchronize_rcu();
                if (atomic_read(&rdev->nr_pending)) {
                        /* lost the race, try later */
                        err = -EBUSY;
@@ -1181,10 +1197,6 @@ static int run(mddev_t *mddev)
        if (!conf->r1bio_pool)
                goto out_no_mem;
 
-       mddev->queue->unplug_fn = raid1_unplug;
-
-       mddev->queue->issue_flush_fn = raid1_issue_flush;
-
        ITERATE_RDEV(mddev, rdev, tmp) {
                disk_idx = rdev->raid_disk;
                if (disk_idx >= mddev->raid_disks
@@ -1266,6 +1278,9 @@ static int run(mddev_t *mddev)
         */
        mddev->array_size = mddev->size;
 
+       mddev->queue->unplug_fn = raid1_unplug;
+       mddev->queue->issue_flush_fn = raid1_issue_flush;
+
        return 0;
 
 out_no_mem:
@@ -1346,7 +1361,7 @@ static int raid1_reshape(mddev_t *mddev, int raid_disks)
                if (conf->mirrors[d].rdev)
                        return -EBUSY;
 
-       newpoolinfo = kmalloc(sizeof(newpoolinfo), GFP_KERNEL);
+       newpoolinfo = kmalloc(sizeof(*newpoolinfo), GFP_KERNEL);
        if (!newpoolinfo)
                return -ENOMEM;
        newpoolinfo->mddev = mddev;