Pull percpureserve into release branch

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

diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index f3a772486437e1ee08608e28835adf85911aaaf8..8f25f628ef16d5e680129656d3a1885c115a432d 100644 (file)
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -114,7 +114,7 @@ static void dec_count(struct io *io, unsigned int region, int error)
                        wake_up_process(io->sleeper);
 
                else {
-                       int r = io->error;
+                       unsigned long r = io->error;
                        io_notify_fn fn = io->callback;
                        void *context = io->context;
 
@@ -124,15 +124,11 @@ static void dec_count(struct io *io, unsigned int region, int error)
        }
 }
 
-static int endio(struct bio *bio, unsigned int done, int error)
+static void endio(struct bio *bio, int error)
 {
        struct io *io;
        unsigned region;
 
-       /* keep going until we've finished */
-       if (bio->bi_size)
-               return 1;
-
        if (error && bio_data_dir(bio) == READ)
                zero_fill_bio(bio);
 
@@ -146,8 +142,6 @@ static int endio(struct bio *bio, unsigned int done, int error)
        bio_put(bio);
 
        dec_count(io, region, error);
-
-       return 0;
 }
 
 /*-----------------------------------------------------------------