block: Replace SG_GAPS with new queue limits mask

[karo-tx-linux.git] / drivers / md / dm-table.c

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index afb4ad3dfeb3b1526e2d87f2b93a71f7765caa98..e76ed003769e1bc023e582df9f505c6ed9ca3fc2 100644 (file)
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1380,14 +1380,6 @@ static int queue_supports_sg_merge(struct dm_target *ti, struct dm_dev *dev,
        return q && !test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags);
 }
 
-static int queue_supports_sg_gaps(struct dm_target *ti, struct dm_dev *dev,
-                                 sector_t start, sector_t len, void *data)
-{
-       struct request_queue *q = bdev_get_queue(dev->bdev);
-
-       return q && !test_bit(QUEUE_FLAG_SG_GAPS, &q->queue_flags);
-}
-
 static bool dm_table_all_devices_attribute(struct dm_table *t,
                                           iterate_devices_callout_fn func)
 {
@@ -1508,11 +1500,6 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
        else
                queue_flag_set_unlocked(QUEUE_FLAG_NO_SG_MERGE, q);
 
-       if (dm_table_all_devices_attribute(t, queue_supports_sg_gaps))
-               queue_flag_clear_unlocked(QUEUE_FLAG_SG_GAPS, q);
-       else
-               queue_flag_set_unlocked(QUEUE_FLAG_SG_GAPS, q);
-
        dm_table_set_integrity(t);
 
        /*