Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[karo-tx-linux.git] / drivers / md / dm-zero.c

diff --git a/drivers/md/dm-zero.c b/drivers/md/dm-zero.c
index cdbf126ec10651f6632bfed0401598e3ced361d5..cc2b3cb819465c4f6becb14897d998ebfb976572 100644 (file)
--- a/drivers/md/dm-zero.c
+++ b/drivers/md/dm-zero.c
@@ -22,6 +22,11 @@ static int zero_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                return -EINVAL;
        }
 
+       /*
+        * Silently drop discards, avoiding -EOPNOTSUPP.
+        */
+       ti->num_discard_requests = 1;
+
        return 0;
 }
 
@@ -69,10 +74,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)