cachevol: put _cvol as protected suffix.

This revert "drop cvol dm uuid suffix for cachevol LVs"
commit 5191057d9df3e5b92db3f80c412b99aea1074358.
Start using -cvol for  DM UUID.

diff --git a/WHATS_NEW b/WHATS_NEW
index 6d1700a21560e5b8151c071fdd586674e233722c..6458f4cd076908655fa18a6b0604d9a95c186375 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.03.06 - 
 ================================
+  Add _cvol in list of protected suffixes and start use it with DM UUID.
   Rename LV converted to cachevol to use _cvol suffix.
   Use normal LVs for wiping of cachevols.
   Reload cleanered cache DM only with cleaner policy.

diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 32e795dd69d4e4b492420b0ebcd2a63a9a007261..dfccccef4e42ea97ed392db93254a1780ffe7fcb 100644 (file)
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -46,7 +46,7 @@ typedef enum {
 } action_t;
 
 /* This list must match lib/misc/lvm-string.c:build_dm_uuid(). */
-const char *uuid_suffix_list[] = { "pool", "cdata", "cmeta", "tdata", "tmeta", "vdata", "vpool", NULL};
+const char *uuid_suffix_list[] = { "pool", "cdata", "cmeta", "cvol", "tdata", "tmeta", "vdata", "vpool", NULL};
 
 struct dlid_list {
        struct dm_list list;

diff --git a/lib/misc/lvm-string.c b/lib/misc/lvm-string.c
index bb66214858d60fa11fa8ccfe923f2980b90332f1..4034b405d1b8b6809e8f07343888e00bc857b9d3 100644 (file)
--- a/lib/misc/lvm-string.c
+++ b/lib/misc/lvm-string.c
@@ -157,6 +157,7 @@ static const char *_lvname_has_reserved_component_string(const char *lvname)
                "_cdata",
                "_cmeta",
                "_corig",
+               "_cvol",
                "_wcorig",
                "_mimage",
                "_mlog",
@@ -253,6 +254,7 @@ char *build_dm_uuid(struct dm_pool *mem, const struct logical_volume *lv,
                        (lv_is_cache(lv) && lv_is_pending_delete(lv)) ? "real" :
                        lv_is_cache_pool_data(lv) ? "cdata" :
                        lv_is_cache_pool_metadata(lv) ? "cmeta" :
+                       lv_is_cache_vol(lv) ? "cvol" :
                        // FIXME: dm-tree needs fixes for mirrors/raids
                        //lv_is_mirror_image(lv) ? "mimage" :
                        //lv_is_mirror_log(lv) ? "mlog" :

diff --git a/lib/writecache/writecache.c b/lib/writecache/writecache.c
index 07a2d63bbdac7de5c53ea3f6d170345485639048..0a5b485fe2d8d9655332eb8d068a62772a99371b 100644 (file)
--- a/lib/writecache/writecache.c
+++ b/lib/writecache/writecache.c
@@ -263,7 +263,7 @@ static int _writecache_add_target_line(struct dev_manager *dm,
        if (!(origin_uuid = build_dm_uuid(mem, seg_lv(seg, 0), "real")))
                return_0;
 
-       if (!(fast_uuid = build_dm_uuid(mem, seg->writecache, NULL)))
+       if (!(fast_uuid = build_dm_uuid(mem, seg->writecache, "cvol")))
                return_0;
 
        if (!dm_tree_node_add_writecache_target(node, len,