From 47356a8eccee62a55ea47e6d9ca0d0e1682f2faf Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 27 Mar 2006 01:18:02 -0800
Subject: [PATCH] --- yaml --- r: 24404 b: refs/heads/master c:
 89e5c8b5b85d6d46e8a28cdfa076313ae691d35c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5281e375bc6c..d4ad5b267924 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a22c96c737a9cefbe8d6e991c0032ad6db825a67
+refs/heads/master: 89e5c8b5b85d6d46e8a28cdfa076313ae691d35c
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
index 062067fa7ead..a2e333ad0b64 100644
--- a/trunk/block/ll_rw_blk.c
+++ b/trunk/block/ll_rw_blk.c
@@ -785,6 +785,8 @@ void blk_queue_stack_limits(request_queue_t *t, request_queue_t *b)
 	t->max_hw_segments = min(t->max_hw_segments,b->max_hw_segments);
 	t->max_segment_size = min(t->max_segment_size,b->max_segment_size);
 	t->hardsect_size = max(t->hardsect_size,b->hardsect_size);
+	if (!test_bit(QUEUE_FLAG_CLUSTER, &b->queue_flags))
+		clear_bit(QUEUE_FLAG_CLUSTER, &t->queue_flags);
 }
 
 EXPORT_SYMBOL(blk_queue_stack_limits);
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index bde3e9682250..3254ff1a5cc9 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -266,6 +266,7 @@ static mddev_t * mddev_find(dev_t unit)
 		kfree(new);
 		return NULL;
 	}
+	set_bit(QUEUE_FLAG_CLUSTER, &new->queue->queue_flags);
 
 	blk_queue_make_request(new->queue, md_fail_request);