diff --git a/[refs] b/[refs]
index 1fdfbf4144a7..fb3929356bda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fd5d48027181168ce85e8094b926aeb9f34c556
+refs/heads/master: 38e1b257fd7b4f3eee667d29a5e44ec15e253c1c
diff --git a/trunk/drivers/md/dm-target.c b/trunk/drivers/md/dm-target.c
index 11dea11dc0b6..8da366cf381c 100644
--- a/trunk/drivers/md/dm-target.c
+++ b/trunk/drivers/md/dm-target.c
@@ -113,6 +113,11 @@ void dm_unregister_target(struct target_type *tt)
  */
 static int io_err_ctr(struct dm_target *tt, unsigned int argc, char **args)
 {
+	/*
+	 * Return error for discards instead of -EOPNOTSUPP
+	 */
+	tt->num_discard_requests = 1;
+
 	return 0;
 }