Drop 'size' argument from bio_endio and bi_end_io

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / md / raid10.c

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 4e53792aa520b8c5fc0aa18df1266dae15d998bf..25a96c42bdb0c4b922c9c48dd9ba093ded1b44eb 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -227,7 +227,7 @@ static void raid_end_bio_io(r10bio_t *r10_bio)
 {
        struct bio *bio = r10_bio->master_bio;
 
-       bio_endio(bio, bio->bi_size,
+       bio_endio(bio,
                test_bit(R10BIO_Uptodate, &r10_bio->state) ? 0 : -EIO);
        free_r10bio(r10_bio);
 }
@@ -243,15 +243,13 @@ static inline void update_head_pos(int slot, r10bio_t *r10_bio)
                r10_bio->devs[slot].addr + (r10_bio->sectors);
 }
 
-static int raid10_end_read_request(struct bio *bio, unsigned int bytes_done, int error)
+static void raid10_end_read_request(struct bio *bio, int error)
 {
        int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
        r10bio_t * r10_bio = (r10bio_t *)(bio->bi_private);
        int slot, dev;
        conf_t *conf = mddev_to_conf(r10_bio->mddev);
 
-       if (bio->bi_size)
-               return 1;
 
        slot = r10_bio->read_slot;
        dev = r10_bio->devs[slot].devnum;
@@ -284,19 +282,15 @@ static int raid10_end_read_request(struct bio *bio, unsigned int bytes_done, int
        }
 
        rdev_dec_pending(conf->mirrors[dev].rdev, conf->mddev);
-       return 0;
 }
 
-static int raid10_end_write_request(struct bio *bio, unsigned int bytes_done, int error)
+static void raid10_end_write_request(struct bio *bio, int error)
 {
        int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
        r10bio_t * r10_bio = (r10bio_t *)(bio->bi_private);
        int slot, dev;
        conf_t *conf = mddev_to_conf(r10_bio->mddev);
 
-       if (bio->bi_size)
-               return 1;
-
        for (slot = 0; slot < conf->copies; slot++)
                if (r10_bio->devs[slot].bio == bio)
                        break;
@@ -339,7 +333,6 @@ static int raid10_end_write_request(struct bio *bio, unsigned int bytes_done, in
        }
 
        rdev_dec_pending(conf->mirrors[dev].rdev, conf->mddev);
-       return 0;
 }
 
 
@@ -787,7 +780,7 @@ static int make_request(struct request_queue *q, struct bio * bio)
        unsigned long flags;
 
        if (unlikely(bio_barrier(bio))) {
-               bio_endio(bio, bio->bi_size, -EOPNOTSUPP);
+               bio_endio(bio, -EOPNOTSUPP);
                return 0;
        }
 
@@ -819,7 +812,7 @@ static int make_request(struct request_queue *q, struct bio * bio)
                       " or bigger than %dk %llu %d\n", chunk_sects/2,
                       (unsigned long long)bio->bi_sector, bio->bi_size >> 10);
 
-               bio_io_error(bio, bio->bi_size);
+               bio_io_error(bio);
                return 0;
        }
 
@@ -1155,15 +1148,12 @@ abort:
 }
 
 
-static int end_sync_read(struct bio *bio, unsigned int bytes_done, int error)
+static void end_sync_read(struct bio *bio, int error)
 {
        r10bio_t * r10_bio = (r10bio_t *)(bio->bi_private);
        conf_t *conf = mddev_to_conf(r10_bio->mddev);
        int i,d;
 
-       if (bio->bi_size)
-               return 1;
-
        for (i=0; i<conf->copies; i++)
                if (r10_bio->devs[i].bio == bio)
                        break;
@@ -1192,10 +1182,9 @@ static int end_sync_read(struct bio *bio, unsigned int bytes_done, int error)
                reschedule_retry(r10_bio);
        }
        rdev_dec_pending(conf->mirrors[d].rdev, conf->mddev);
-       return 0;
 }
 
-static int end_sync_write(struct bio *bio, unsigned int bytes_done, int error)
+static void end_sync_write(struct bio *bio, int error)
 {
        int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
        r10bio_t * r10_bio = (r10bio_t *)(bio->bi_private);
@@ -1203,9 +1192,6 @@ static int end_sync_write(struct bio *bio, unsigned int bytes_done, int error)
        conf_t *conf = mddev_to_conf(mddev);
        int i,d;
 
-       if (bio->bi_size)
-               return 1;
-
        for (i = 0; i < conf->copies; i++)
                if (r10_bio->devs[i].bio == bio)
                        break;
@@ -1228,7 +1214,6 @@ static int end_sync_write(struct bio *bio, unsigned int bytes_done, int error)
                }
        }
        rdev_dec_pending(conf->mirrors[d].rdev, mddev);
-       return 0;
 }
 
 /*
@@ -1374,7 +1359,7 @@ static void recovery_request_write(mddev_t *mddev, r10bio_t *r10_bio)
        if (test_bit(R10BIO_Uptodate, &r10_bio->state))
                generic_make_request(wbio);
        else
-               bio_endio(wbio, wbio->bi_size, -EIO);
+               bio_endio(wbio, -EIO);
 }