Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

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

diff --git a/drivers/md/dm-zero.c b/drivers/md/dm-zero.c
index ea569f7348d2a284b983d766614d1ff8d8fb82ac..cdbf126ec10651f6632bfed0401598e3ced361d5 100644 (file)
--- a/drivers/md/dm-zero.c
+++ b/drivers/md/dm-zero.c
@@ -4,7 +4,7 @@
  * This file is released under the GPL.
  */
 
-#include "dm.h"
+#include <linux/device-mapper.h>
 
 #include <linux/module.h>
 #include <linux/init.h>
@@ -43,10 +43,10 @@ static int zero_map(struct dm_target *ti, struct bio *bio,
                break;
        }
 
-       bio_endio(bio, bio->bi_size, 0);
+       bio_endio(bio, 0);
 
        /* accepted bio, don't make new request */
-       return 0;
+       return DM_MAPIO_SUBMITTED;
 }
 
 static struct target_type zero_target = {