Merge branch 'topic/hda' into for-linus

[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..bbc97030c0c200eb35160beddb0342693c7c7250 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 = {
@@ -69,10 +69,7 @@ static int __init dm_zero_init(void)
 
 static void __exit dm_zero_exit(void)
 {
-       int r = dm_unregister_target(&zero_target);
-
-       if (r < 0)
-               DMERR("unregister failed %d", r);
+       dm_unregister_target(&zero_target);
 }
 
 module_init(dm_zero_init)