Merge git://git.infradead.org/iommu-2.6

[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 51c0639b248770e25405af6b07fbade900318df7..cdbf126ec10651f6632bfed0401598e3ced361d5 100644 (file)
--- a/drivers/md/dm-zero.c
+++ b/drivers/md/dm-zero.c
@@ -4,19 +4,21 @@
  * This file is released under the GPL.
  */
 
-#include "dm.h"
+#include <linux/device-mapper.h>
 
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/bio.h>
 
+#define DM_MSG_PREFIX "zero"
+
 /*
  * Construct a dummy mapping that only returns zeros
  */
 static int zero_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 {
        if (argc != 0) {
-               ti->error = "dm-zero: No arguments required";
+               ti->error = "No arguments required";
                return -EINVAL;
        }
 
@@ -41,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 = {
@@ -60,7 +62,7 @@ static int __init dm_zero_init(void)
        int r = dm_register_target(&zero_target);
 
        if (r < 0)
-               DMERR("zero: register failed %d", r);
+               DMERR("register failed %d", r);
 
        return r;
 }
@@ -70,7 +72,7 @@ static void __exit dm_zero_exit(void)
        int r = dm_unregister_target(&zero_target);
 
        if (r < 0)
-               DMERR("zero: unregister failed %d", r);
+               DMERR("unregister failed %d", r);
 }
 
 module_init(dm_zero_init)