Drop 'size' argument from bio_endio and bi_end_io

[deliverable/linux.git] / drivers / md / dm-emc.c

diff --git a/drivers/md/dm-emc.c b/drivers/md/dm-emc.c
index 265c467854da7eccc62c7d5c09ec1495c2c65065..a2191a4fcf77120d6d9033b0cedb58ab3adc1c3a 100644 (file)
--- a/drivers/md/dm-emc.c
+++ b/drivers/md/dm-emc.c
@@ -38,13 +38,10 @@ static inline void free_bio(struct bio *bio)
        bio_put(bio);
 }
 
-static int emc_endio(struct bio *bio, unsigned int bytes_done, int error)
+static void emc_endio(struct bio *bio, int error)
 {
        struct dm_path *path = bio->bi_private;
 
-       if (bio->bi_size)
-               return 1;
-
        /* We also need to look at the sense keys here whether or not to
         * switch to the next PG etc.
         *
@@ -109,15 +106,7 @@ static struct request *get_failover_req(struct emc_handler *h,
                return NULL;
        }
 
-       rq->bio = rq->biotail = bio;
-       blk_rq_bio_prep(q, rq, bio);
-
-       rq->rq_disk = bdev->bd_contains->bd_disk;
-
-       /* bio backed don't set data */
-       rq->buffer = rq->data = NULL;
-       /* rq data_len used for pc cmd's request_bufflen */
-       rq->data_len = bio->bi_size;
+       blk_rq_append_bio(q, rq, bio);
 
        rq->sense = h->sense;
        memset(rq->sense, 0, SCSI_SENSE_BUFFERSIZE);