diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2015-11-26 09:18:46 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-11-26 09:27:04 +0100 |
| commit | d582be43d4cee8c74ee4e251d299a321ded474fa (patch) | |
| tree | 983ada6673cef265088b77959d0c7c5a65a08a06 | |
| parent | 1ea8afd3caa54259e58d8e3443389c819281c8c0 (diff) | |
| download | lvm2-d582be43d4cee8c74ee4e251d299a321ded474fa.tar.gz | |
libdm: const raid params and error for unsupported type
Accept const struct with raid params (No API change).
Also add extra error message when raid type is unsupported.
| -rw-r--r-- | WHATS_NEW_DM | 1 | ||||
| -rw-r--r-- | libdm/libdevmapper.h | 2 | ||||
| -rw-r--r-- | libdm/libdm-deptree.c | 8 |
3 files changed, 7 insertions, 4 deletions
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 600c5b73f..a510938e8 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.112 - ===================================== + Show error message when trying to create unsupported raid type. Improve preloading sequence of an active thin-pool target. Drop extra space from cache target line to fix unneded table reloads. diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 6619aa7af..310ceb7a9 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -1441,7 +1441,7 @@ struct dm_tree_node_raid_params { int dm_tree_node_add_raid_target_with_params(struct dm_tree_node *node, uint64_t size, - struct dm_tree_node_raid_params *p); + const struct dm_tree_node_raid_params *p); /* Cache feature_flags */ #define DM_CACHE_FEATURE_WRITEBACK 0x00000001 diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 0b33ad348..73f2e4ce7 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -3207,7 +3207,7 @@ int dm_tree_node_add_mirror_target(struct dm_tree_node *node, int dm_tree_node_add_raid_target_with_params(struct dm_tree_node *node, uint64_t size, - struct dm_tree_node_raid_params *p) + const struct dm_tree_node_raid_params *p) { unsigned i; struct load_segment *seg = NULL; @@ -3217,8 +3217,10 @@ int dm_tree_node_add_raid_target_with_params(struct dm_tree_node *node, if (!(seg = _add_segment(node, _dm_segtypes[i].type, size))) return_0; - if (!seg) - return_0; + if (!seg) { + log_error("Unsupported raid type %s.", p->raid_type); + return 0; + } seg->region_size = p->region_size; seg->stripe_size = p->stripe_size; |