From 2e7066a58188376951d8c754eee31dfc6d6275a8 Mon Sep 17 00:00:00 2001
From: Milan Broz <mbroz@redhat.com>
Date: Wed, 9 May 2007 02:32:51 -0700
Subject: [PATCH] --- yaml --- r: 55295 b: refs/heads/master c:
 9c89f8be1a7d14aad9d2c3f7d90d7d88f82c61e2 h: refs/heads/master i:   55293:
 abd7f74808cd8e5b871d43998e772625a410c656   55291:
 d6b0a75b1cf332176a05793140ce6cdfb1aab48e   55287:
 4585f9f858755004f8bf447d22b8d558743d9fc5   55279:
 55b2304919f23ff4fbb1f6788f073469641fb45c   55263:
 425b8492571d1458b0e8595eba2fc8f504ac5a30   55231:
 7b6a5c19c40f123fd889a5c76844d1b0551b1af7   55167:
 fdc8757eeefeccb9f33ae806769c474612b7788a   55039:
 f0a1b3f3d7e77562610bd47d3e8a636ba1de43c9   54783:
 0f9f331f48e2740dee12ca32115d95c7d008b369   54271:
 677fab205a88b6bd085d4cb2cf87664671b2bc12   53247:
 2f024ad2cf79ba66292b55b78f462e1a38f0045d v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/md/dm-crypt.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e4cbac6c9a64..5f66eb291f4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ad36fe2b451cc85cc7b14f4128286759e217124
+refs/heads/master: 9c89f8be1a7d14aad9d2c3f7d90d7d88f82c61e2
diff --git a/trunk/drivers/md/dm-crypt.c b/trunk/drivers/md/dm-crypt.c
index d8121234c347..8527827b24f1 100644
--- a/trunk/drivers/md/dm-crypt.c
+++ b/trunk/drivers/md/dm-crypt.c
@@ -954,6 +954,9 @@ static int crypt_map(struct dm_target *ti, struct bio *bio,
 	struct crypt_config *cc = ti->private;
 	struct crypt_io *io;
 
+	if (bio_barrier(bio))
+		return -EOPNOTSUPP;
+
 	io = mempool_alloc(cc->io_pool, GFP_NOIO);
 	io->target = ti;
 	io->base_bio = bio;