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.

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 600c5b73f6a97b917ef0ffaa23592f970692ad44..a510938e8e2a5c2a2cd2eb99057a27ed89270862 100644 (file)
--- 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 6619aa7af797fd90be3192ec8594774317b6ddb5..310ceb7a9b40ff65dc002d6a624272f679f48fe1 100644 (file)
--- 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 0b33ad348da9fb0b918625c20b1b8ecd0cfd0485..73f2e4ce74ba8d73d136f22bbdff69052c3ad03a 100644 (file)
--- 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;