From 5e2aa7655197d766d2d9f8ea261a7a83029b5efc Mon Sep 17 00:00:00 2001
From: Mike Snitzer <snitzer@redhat.com>
Date: Thu, 23 Jul 2009 20:30:40 +0100
Subject: [PATCH] --- yaml --- r: 155753 b: refs/heads/master c:
 a732c207d19e899845ae47139708af898daaf9fd h: refs/heads/master i:   155751:
 324c392b5cedcfb3d8e79a6d206162cbeac66073 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/md/dm-table.c |  5 -----
 trunk/drivers/md/dm.c       | 10 ----------
 trunk/drivers/md/dm.h       |  1 -
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index b46829206403..9ad8194b9a7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69885683d22d8c05910fd808c01fdce1322739b4
+refs/heads/master: a732c207d19e899845ae47139708af898daaf9fd
diff --git a/trunk/drivers/md/dm-table.c b/trunk/drivers/md/dm-table.c
index 2cba557d9e61..5d16d06613aa 100644
--- a/trunk/drivers/md/dm-table.c
+++ b/trunk/drivers/md/dm-table.c
@@ -830,11 +830,6 @@ unsigned dm_table_get_type(struct dm_table *t)
 	return t->type;
 }
 
-bool dm_table_bio_based(struct dm_table *t)
-{
-	return dm_table_get_type(t) == DM_TYPE_BIO_BASED;
-}
-
 bool dm_table_request_based(struct dm_table *t)
 {
 	return dm_table_get_type(t) == DM_TYPE_REQUEST_BASED;
diff --git a/trunk/drivers/md/dm.c b/trunk/drivers/md/dm.c
index 9acd54a5cffb..8a311ea0d441 100644
--- a/trunk/drivers/md/dm.c
+++ b/trunk/drivers/md/dm.c
@@ -2203,16 +2203,6 @@ int dm_swap_table(struct mapped_device *md, struct dm_table *table)
 		goto out;
 	}
 
-	/*
-	 * It is enought that blk_queue_ordered() is called only once when
-	 * the first bio-based table is bound.
-	 *
-	 * This setting should be moved to alloc_dev() when request-based dm
-	 * supports barrier.
-	 */
-	if (!md->map && dm_table_bio_based(table))
-		blk_queue_ordered(md->queue, QUEUE_ORDERED_DRAIN, NULL);
-
 	__unbind(md);
 	r = __bind(md, table, &limits);
 
diff --git a/trunk/drivers/md/dm.h b/trunk/drivers/md/dm.h
index 23278ae80f08..a7663eba17e2 100644
--- a/trunk/drivers/md/dm.h
+++ b/trunk/drivers/md/dm.h
@@ -61,7 +61,6 @@ int dm_table_any_congested(struct dm_table *t, int bdi_bits);
 int dm_table_any_busy_target(struct dm_table *t);
 int dm_table_set_type(struct dm_table *t);
 unsigned dm_table_get_type(struct dm_table *t);
-bool dm_table_bio_based(struct dm_table *t);
 bool dm_table_request_based(struct dm_table *t);
 int dm_table_alloc_md_mempools(struct dm_table *t);
 void dm_table_free_md_mempools(struct dm_table *t);