diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2019-10-07 14:58:26 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2019-10-14 15:16:05 +0200 |
| commit | a454a1b4ea478ce117808c8b2dd480ff4d5eb2d4 (patch) | |
| tree | c74b1cbc57f50a82bfc44913d556d7c0742a5b83 | |
| parent | 8d8047883ea56e633007f3bcca6e87e6cb14cef4 (diff) | |
| download | lvm2-a454a1b4ea478ce117808c8b2dd480ff4d5eb2d4.tar.gz | |
cachevol: put _cvol as protected suffix.
This revert "drop cvol dm uuid suffix for cachevol LVs"
commit 5191057d9df3e5b92db3f80c412b99aea1074358.
Start using -cvol for DM UUID.
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | lib/activate/dev_manager.c | 2 | ||||
| -rw-r--r-- | lib/misc/lvm-string.c | 2 | ||||
| -rw-r--r-- | lib/writecache/writecache.c | 2 |
4 files changed, 5 insertions, 2 deletions
@@ -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 32e795dd6..dfccccef4 100644 --- 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 bb6621485..4034b405d 100644 --- 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 07a2d63bb..0a5b485fe 100644 --- 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, |