Merge branch 'dm-4.12' into dm-4.12-post-merge

[mirror_ubuntu-artful-kernel.git] / drivers / md / dm-crypt.c

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 24f3b9fdeeb6401622213308e8ea497ab1d8c82f..ebf9e72d479b9c46e2316eb121917ce9862af5be 100644 (file)
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -2756,7 +2756,6 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        wake_up_process(cc->write_thread);
 
        ti->num_flush_bios = 1;
-       ti->discard_zeroes_data_unsupported = true;
 
        return 0;