aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorAlasdair G Kergon <agk@redhat.com>2011-10-31 16:19:04 -0400
committerAlasdair G Kergon <agk@redhat.com>2011-10-31 16:19:04 -0400
commit36a0456fbf2d9680bf9af81b39daf4a8e22cb1b8 (patch)
treea19af18640d538e8357c195e6b4c77d0f6c92391 /drivers/md
parentcc6cbe141a20f6d876b161b60af38d93935bfa85 (diff)
dm table: add immutable feature
Introduce DM_TARGET_IMMUTABLE to indicate that the target type cannot be mixed with any other target type, and once loaded into a device, it cannot be replaced with a table containing a different type. The thin provisioning pool device will use this. Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/dm-ioctl.c11
-rw-r--r--drivers/md/dm-table.c21
-rw-r--r--drivers/md/dm.c9
-rw-r--r--drivers/md/dm.h2
4 files changed, 43 insertions, 0 deletions
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 2e9a3ca37bdd..31c2dc25886d 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1215,6 +1215,7 @@ static int table_load(struct dm_ioctl *param, size_t param_size)
1215 struct hash_cell *hc; 1215 struct hash_cell *hc;
1216 struct dm_table *t; 1216 struct dm_table *t;
1217 struct mapped_device *md; 1217 struct mapped_device *md;
1218 struct target_type *immutable_target_type;
1218 1219
1219 md = find_device(param); 1220 md = find_device(param);
1220 if (!md) 1221 if (!md)
@@ -1230,6 +1231,16 @@ static int table_load(struct dm_ioctl *param, size_t param_size)
1230 goto out; 1231 goto out;
1231 } 1232 }
1232 1233
1234 immutable_target_type = dm_get_immutable_target_type(md);
1235 if (immutable_target_type &&
1236 (immutable_target_type != dm_table_get_immutable_target_type(t))) {
1237 DMWARN("can't replace immutable target type %s",
1238 immutable_target_type->name);
1239 dm_table_destroy(t);
1240 r = -EINVAL;
1241 goto out;
1242 }
1243
1233 /* Protect md->type and md->queue against concurrent table loads. */ 1244 /* Protect md->type and md->queue against concurrent table loads. */
1234 dm_lock_md_type(md); 1245 dm_lock_md_type(md);
1235 if (dm_get_md_type(md) == DM_TYPE_NONE) 1246 if (dm_get_md_type(md) == DM_TYPE_NONE)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 9917141729ef..8e9132130142 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -54,6 +54,7 @@ struct dm_table {
54 sector_t *highs; 54 sector_t *highs;
55 struct dm_target *targets; 55 struct dm_target *targets;
56 56
57 struct target_type *immutable_target_type;
57 unsigned integrity_supported:1; 58 unsigned integrity_supported:1;
58 unsigned singleton:1; 59 unsigned singleton:1;
59 60
@@ -780,6 +781,21 @@ int dm_table_add_target(struct dm_table *t, const char *type,
780 return -EINVAL; 781 return -EINVAL;
781 } 782 }
782 783
784 if (t->immutable_target_type) {
785 if (t->immutable_target_type != tgt->type) {
786 DMERR("%s: immutable target type %s cannot be mixed with other target types",
787 dm_device_name(t->md), t->immutable_target_type->name);
788 return -EINVAL;
789 }
790 } else if (dm_target_is_immutable(tgt->type)) {
791 if (t->num_targets) {
792 DMERR("%s: immutable target type %s cannot be mixed with other target types",
793 dm_device_name(t->md), tgt->type->name);
794 return -EINVAL;
795 }
796 t->immutable_target_type = tgt->type;
797 }
798
783 tgt->table = t; 799 tgt->table = t;
784 tgt->begin = start; 800 tgt->begin = start;
785 tgt->len = len; 801 tgt->len = len;
@@ -937,6 +953,11 @@ unsigned dm_table_get_type(struct dm_table *t)
937 return t->type; 953 return t->type;
938} 954}
939 955
956struct target_type *dm_table_get_immutable_target_type(struct dm_table *t)
957{
958 return t->immutable_target_type;
959}
960
940bool dm_table_request_based(struct dm_table *t) 961bool dm_table_request_based(struct dm_table *t)
941{ 962{
942 return dm_table_get_type(t) == DM_TYPE_REQUEST_BASED; 963 return dm_table_get_type(t) == DM_TYPE_REQUEST_BASED;
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 2fe3017ba97c..9836324e2118 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -140,6 +140,8 @@ struct mapped_device {
140 /* Protect queue and type against concurrent access. */ 140 /* Protect queue and type against concurrent access. */
141 struct mutex type_lock; 141 struct mutex type_lock;
142 142
143 struct target_type *immutable_target_type;
144
143 struct gendisk *disk; 145 struct gendisk *disk;
144 char name[16]; 146 char name[16];
145 147
@@ -2096,6 +2098,8 @@ static struct dm_table *__bind(struct mapped_device *md, struct dm_table *t,
2096 write_lock_irqsave(&md->map_lock, flags); 2098 write_lock_irqsave(&md->map_lock, flags);
2097 old_map = md->map; 2099 old_map = md->map;
2098 md->map = t; 2100 md->map = t;
2101 md->immutable_target_type = dm_table_get_immutable_target_type(t);
2102
2099 dm_table_set_restrictions(t, q, limits); 2103 dm_table_set_restrictions(t, q, limits);
2100 if (merge_is_optional) 2104 if (merge_is_optional)
2101 set_bit(DMF_MERGE_IS_OPTIONAL, &md->flags); 2105 set_bit(DMF_MERGE_IS_OPTIONAL, &md->flags);
@@ -2166,6 +2170,11 @@ unsigned dm_get_md_type(struct mapped_device *md)
2166 return md->type; 2170 return md->type;
2167} 2171}
2168 2172
2173struct target_type *dm_get_immutable_target_type(struct mapped_device *md)
2174{
2175 return md->immutable_target_type;
2176}
2177
2169/* 2178/*
2170 * Fully initialize a request-based queue (->elevator, ->request_fn, etc). 2179 * Fully initialize a request-based queue (->elevator, ->request_fn, etc).
2171 */ 2180 */
diff --git a/drivers/md/dm.h b/drivers/md/dm.h
index 6745dbd278a4..b7dacd59d8d7 100644
--- a/drivers/md/dm.h
+++ b/drivers/md/dm.h
@@ -60,6 +60,7 @@ int dm_table_resume_targets(struct dm_table *t);
60int dm_table_any_congested(struct dm_table *t, int bdi_bits); 60int dm_table_any_congested(struct dm_table *t, int bdi_bits);
61int dm_table_any_busy_target(struct dm_table *t); 61int dm_table_any_busy_target(struct dm_table *t);
62unsigned dm_table_get_type(struct dm_table *t); 62unsigned dm_table_get_type(struct dm_table *t);
63struct target_type *dm_table_get_immutable_target_type(struct dm_table *t);
63bool dm_table_request_based(struct dm_table *t); 64bool dm_table_request_based(struct dm_table *t);
64bool dm_table_supports_discards(struct dm_table *t); 65bool dm_table_supports_discards(struct dm_table *t);
65int dm_table_alloc_md_mempools(struct dm_table *t); 66int dm_table_alloc_md_mempools(struct dm_table *t);
@@ -72,6 +73,7 @@ void dm_lock_md_type(struct mapped_device *md);
72void dm_unlock_md_type(struct mapped_device *md); 73void dm_unlock_md_type(struct mapped_device *md);
73void dm_set_md_type(struct mapped_device *md, unsigned type); 74void dm_set_md_type(struct mapped_device *md, unsigned type);
74unsigned dm_get_md_type(struct mapped_device *md); 75unsigned dm_get_md_type(struct mapped_device *md);
76struct target_type *dm_get_immutable_target_type(struct mapped_device *md);
75 77
76int dm_setup_md_queue(struct mapped_device *md); 78int dm_setup_md_queue(struct mapped_device *md);
77 79