Merge branch 'akpm' (patches from Andrew)

[firefly-linux-kernel-4.4.55.git] / drivers / md / faulty.c

diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index 1277eb26b58ac602f719e1ee0904b47611f90de5..4a8e15058e8b56a8a9d89d9f0db50135df44c6d3 100644 (file)
--- a/drivers/md/faulty.c
+++ b/drivers/md/faulty.c
@@ -70,7 +70,7 @@
 #include <linux/seq_file.h>
 
 
-static void faulty_fail(struct bio *bio, int error)
+static void faulty_fail(struct bio *bio)
 {
        struct bio *b = bio->bi_private;
 
@@ -181,7 +181,7 @@ static void make_request(struct mddev *mddev, struct bio *bio)
                        /* special case - don't decrement, don't generic_make_request,
                         * just fail immediately
                         */
-                       bio_endio(bio, -EIO);
+                       bio_io_error(bio);
                        return;
                }