diff --git a/[refs] b/[refs]
index 617dd08e8393..69a7d58ccf9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbdac9b71dff5d27885f82eb2cfca310861fdf9e
+refs/heads/master: cec0707e40ae25794b5a2de7b7f03c51961f80d9
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index 9e2e86fb78b8..ae75c047f45d 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/block/blk-core.c
@@ -1451,6 +1451,11 @@ static inline void __generic_make_request(struct bio *bio)
 			err = -EOPNOTSUPP;
 			goto end_io;
 		}
+		if (bio_barrier(bio) && bio_has_data(bio) &&
+		    (q->next_ordered == QUEUE_ORDERED_NONE)) {
+			err = -EOPNOTSUPP;
+			goto end_io;
+		}
 
 		ret = q->make_request_fn(q, bio);
 	} while (ret);