Commit 87eb5b21 authored Mar 01, 2013 by Mike Christie Committed by Alasdair G Kergon Mar 01, 2013

dm: fix limits initialization when there are no data devices



dm_calculate_queue_limits will first reset the provided limits to
defaults using blk_set_stacking_limits; whereby defeating the purpose of
retaining the original live table's limits -- as was intended via commit
3ae70656 ("dm: retain table limits when
swapping to new table with no devices").

Fix this improper limits initialization (in the no data devices case) by
avoiding the call to dm_calculate_queue_limits.

[patch header revised by Mike Snitzer]

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Cc: stable@vger.kernel.org # v3.6+
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

parent 23cb2109

drivers/md/dm.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -2446,7 +2446,7 @@ static void dm_queue_flush(struct mapped_device *md)
		*/
		struct dm_table dm_swap_table(struct mapped_device md, struct dm_table *table)
		{
		struct dm_table live_map, map = ERR_PTR(-EINVAL);
		struct dm_table live_map = NULL, map = ERR_PTR(-EINVAL);
		struct queue_limits limits;
		int r;

		@@ -2469,11 +2469,13 @@ struct dm_table dm_swap_table(struct mapped_device md, struct dm_table *table)
		dm_table_put(live_map);
		}

		if (!live_map) {
		r = dm_calculate_queue_limits(table, &limits);
		if (r) {
		map = ERR_PTR(r);
		goto out;
		}
		}

		map = __bind(md, table, &limits);