Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index 4ebd0f2a75ecee907c06b76c659ddc1e9e700841..d107ddceefcd4651eabaca68f34cf608c4046a56 100644 (file)
--- a/drivers/md/faulty.c
+++ b/drivers/md/faulty.c
@@ -65,18 +65,16 @@
 #include <linux/raid/md.h>
 
 
-static int faulty_fail(struct bio *bio, unsigned int bytes_done, int error)
+static void faulty_fail(struct bio *bio, int error)
 {
        struct bio *b = bio->bi_private;
 
        b->bi_size = bio->bi_size;
        b->bi_sector = bio->bi_sector;
 
-       if (bio->bi_size == 0)
-               bio_put(bio);
+       bio_put(bio);
 
-       clear_bit(BIO_UPTODATE, &b->bi_flags);
-       return (b->bi_end_io)(b, bytes_done, -EIO);
+       bio_io_error(b);
 }
 
 typedef struct faulty_conf {
@@ -167,7 +165,7 @@ static void add_sector(conf_t *conf, sector_t start, int mode)
                conf->nfaults = n+1;
 }
 
-static int make_request(request_queue_t *q, struct bio *bio)
+static int make_request(struct request_queue *q, struct bio *bio)
 {
        mddev_t *mddev = q->queuedata;
        conf_t *conf = (conf_t*)mddev->private;
@@ -179,7 +177,7 @@ static int make_request(request_queue_t *q, struct bio *bio)
                        /* special case - don't decrement, don't generic_make_request,
                         * just fail immediately
                         */
-                       bio_endio(bio, bio->bi_size, -EIO);
+                       bio_endio(bio, -EIO);
                        return 0;
                }
 
@@ -296,7 +294,7 @@ static int run(mddev_t *mddev)
        }
        conf->nfaults = 0;
 
-       ITERATE_RDEV(mddev, rdev, tmp)
+       rdev_for_each(rdev, tmp, mddev)
                conf->rdev = rdev;
 
        mddev->array_size = mddev->size;