From dea60a75b0b190053804d4af576deae1383d080e Mon Sep 17 00:00:00 2001
From: Milan Broz <mbroz@redhat.com>
Date: Mon, 21 Jul 2008 12:00:39 +0100
Subject: [PATCH] --- yaml --- r: 104298 b: refs/heads/master c:
 9980c638a666ecd88acaf0a7ab91043d4a3f44d1 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/md/dm-table.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 61d442b9480d..31774150e872 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bc3447b692185c5ea78bee93d0ef1dee2fd7ce7
+refs/heads/master: 9980c638a666ecd88acaf0a7ab91043d4a3f44d1
diff --git a/trunk/drivers/md/dm-table.c b/trunk/drivers/md/dm-table.c
index 94116eaf4709..798e468103b8 100644
--- a/trunk/drivers/md/dm-table.c
+++ b/trunk/drivers/md/dm-table.c
@@ -506,14 +506,13 @@ void dm_set_device_limits(struct dm_target *ti, struct block_device *bdev)
 	rs->max_sectors =
 		min_not_zero(rs->max_sectors, q->max_sectors);
 
-	/* FIXME: Device-Mapper on top of RAID-0 breaks because DM
-	 *        currently doesn't honor MD's merge_bvec_fn routine.
-	 *        In this case, we'll force DM to use PAGE_SIZE or
-	 *        smaller I/O, just to be safe. A better fix is in the
-	 *        works, but add this for the time being so it will at
-	 *        least operate correctly.
+	/*
+	 * Check if merge fn is supported.
+	 * If not we'll force DM to use PAGE_SIZE or
+	 * smaller I/O, just to be safe.
 	 */
-	if (q->merge_bvec_fn)
+
+	if (q->merge_bvec_fn && !ti->type->merge)
 		rs->max_sectors =
 			min_not_zero(rs->max_sectors,
 				     (unsigned int) (PAGE_SIZE >> 9));