Drop 'size' argument from bio_endio and bi_end_io

As bi_end_io is only called once when the reqeust is complete,
the 'size' argument is now redundant.  Remove it.

Now there is no need for bio_endio to subtract the size completed
from bi_size.  So don't do that either.

While we are at it, change bi_end_io to return void.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index cb059cf14c2e..cf2ddce34118 100644
--- 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 {
@@ -179,7 +177,7 @@ static int make_request(struct request_queue *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;
                 }