From 30a4228348c0579cef4723f0840493057f8ba169 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 13 Jan 2009 15:28:32 +0100
Subject: [PATCH] --- yaml --- r: 130515 b: refs/heads/master c:
 cec0707e40ae25794b5a2de7b7f03c51961f80d9 h: refs/heads/master i:   130513:
 0d34b1cdf39418616c25a9dc272cec9cc2172b26   130511:
 725bfab5f698babc560dbc1d08f546ad867accfe v: v3

---
 [refs]                 | 2 +-
 trunk/block/blk-core.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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);