Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751463Ab3HUIHx (ORCPT ); Wed, 21 Aug 2013 04:07:53 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:51421 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751159Ab3HUIHu (ORCPT ); Wed, 21 Aug 2013 04:07:50 -0400 Message-ID: <5214754D.7050203@oracle.com> Date: Wed, 21 Aug 2013 16:07:41 +0800 From: Joe Jin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130805 Thunderbird/17.0.8 MIME-Version: 1.0 To: Mike Snitzer , Alasdair Kergon , dm-devel@redhat.com CC: "linux-kernel@vger.kernel.org" , Joe Jin Subject: [PATCH] dm ioctl: allow change device target type to error Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2706 Lines: 84 commit a5664da "dm ioctl: make bio or request based device type immutable" prevented "dmsetup wape_table" change the target type to "error". Signed-off-by: Joe Jin --- drivers/md/dm-ioctl.c | 6 +++++- drivers/md/dm-table.c | 12 ++++++++++++ drivers/md/dm.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index f1b7586..1ee9e41 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -1250,7 +1250,7 @@ static int populate_table(struct dm_table *table, static int table_load(struct dm_ioctl *param, size_t param_size) { - int r; + int r = 0; struct hash_cell *hc; struct dm_table *t, *old_map = NULL; struct mapped_device *md; @@ -1280,6 +1280,9 @@ static int table_load(struct dm_ioctl *param, size_t param_size) goto out; } + if (dm_is_error_target(t)) + goto error_target; + /* Protect md->type and md->queue against concurrent table loads. */ dm_lock_md_type(md); if (dm_get_md_type(md) == DM_TYPE_NONE) @@ -1303,6 +1306,7 @@ static int table_load(struct dm_ioctl *param, size_t param_size) } dm_unlock_md_type(md); +error_target: /* stage inactive table */ down_write(&_hash_lock); hc = dm_get_mdptr(md); diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index f221812..27be46a 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -184,6 +184,18 @@ static int alloc_targets(struct dm_table *t, unsigned int num) return 0; } +bool dm_is_error_target(struct dm_table *t) +{ + unsigned i; + + for (i = 0; i < t->num_targets; i++) { + struct dm_target *tgt = t->targets + i; + if (strcmp(tgt->type->name, "error") == 0) + return true; + } + return false; +} + int dm_table_create(struct dm_table **result, fmode_t mode, unsigned num_targets, struct mapped_device *md) { diff --git a/drivers/md/dm.h b/drivers/md/dm.h index 45b97da..c7bceeb 100644 --- a/drivers/md/dm.h +++ b/drivers/md/dm.h @@ -69,6 +69,7 @@ unsigned dm_table_get_type(struct dm_table *t); struct target_type *dm_table_get_immutable_target_type(struct dm_table *t); bool dm_table_request_based(struct dm_table *t); bool dm_table_supports_discards(struct dm_table *t); +bool dm_is_error_target(struct dm_table *t); int dm_table_alloc_md_mempools(struct dm_table *t); void dm_table_free_md_mempools(struct dm_table *t); struct dm_md_mempools *dm_table_get_md_mempools(struct dm_table *t); -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/