shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

drop cvol dm uuid suffix for cachevol LVs

Browse Source 
The "-cvol" suffix on the uuid is interfering with
activation code, so drop the suffix for now.
This commit is contained in:
David Teigland 2019-09-23 14:10:56 -05:00
parent 338a60bb41
commit 5191057d9d
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/activate/dev_manager.c
View File

@ -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", "cvol", NULL};
const char *uuid_suffix_list[] = { "pool", "cdata", "cmeta", "tdata", "tmeta", "vdata", "vpool", NULL};
struct dlid_list {
struct dm_list list;

2
lib/misc/lvm-string.c
View File

@ -157,7 +157,6 @@ static const char *_lvname_has_reserved_component_string(const char *lvname)
"_cdata",
"_cmeta",
"_corig",
"_cvol",
"_wcorig",
"_mimage",
"_mlog",
@ -254,7 +253,6 @@ 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" :

2
lib/writecache/writecache.c
View File

@ -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, "cvol")))
if (!(fast_uuid = build_dm_uuid(mem, seg->writecache, NULL)))
return_0;
if (!dm_tree_node_add_writecache_target(node, len,