diff --git a/[refs] b/[refs]
index 0b13d332fc76..ed922aca31ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aa2781d964e9835c441932110484bc454b5c207
+refs/heads/master: fdb9572b73abd008b80931c3b1f157dac3888bb9
diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c
index 77972090abe5..8498dc4ce1f0 100644
--- a/trunk/drivers/md/dm.c
+++ b/trunk/drivers/md/dm.c
@@ -555,7 +555,7 @@ static void dec_pending(struct dm_io *io, int error)
 			 * a per-device variable for error reporting.
 			 * Note that you can't touch the bio after end_io_acct
 			 */
-			if (!md->barrier_error)
+			if (!md->barrier_error && io_error != -EOPNOTSUPP)
 				md->barrier_error = io_error;
 			end_io_acct(io);
 		} else {