Commit f80a5570 authored Mar 16, 2009 by Mikulas Patocka Committed by Alasdair G Kergon Mar 16, 2009

dm table: rework reference counting fix



Fix an error introduced in dm-table-rework-reference-counting.patch.

When there is failure after table initialization, we need to use
dm_table_destroy, not dm_table_put, to free the table.

dm_table_put may be used only after dm_table_get.

Cc: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Reviewed-by: Jonathan Brassow <jbrassow@redhat.com>
Reviewed-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

parent bc0fd67f

drivers/md/dm-ioctl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1064,7 +1064,7 @@ static int table_load(struct dm_ioctl *param, size_t param_size)

		r = populate_table(t, param, param_size);
		if (r) {
		dm_table_put(t);
		dm_table_destroy(t);
		goto out;
		}

		@@ -1072,7 +1072,7 @@ static int table_load(struct dm_ioctl *param, size_t param_size)
		hc = dm_get_mdptr(md);
		if (!hc \|\| hc->md != md) {
		DMWARN("device has been removed from the dev hash table.");
		dm_table_put(t);
		dm_table_destroy(t);
		up_write(&_hash_lock);
		r = -ENXIO;
		goto out;