Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / md / dm-zero.c

diff --git a/drivers/md/dm-zero.c b/drivers/md/dm-zero.c
index bbc97030c0c200eb35160beddb0342693c7c7250..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;
 }