mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-03 05:18:29 +03:00
cachevol: put _cvol as protected suffix.
This revert "drop cvol dm uuid suffix for cachevol LVs"
commit 5191057d9d
.
Start using -cvol for DM UUID.
This commit is contained in:
parent
8d8047883e
commit
a454a1b4ea
@ -1,5 +1,6 @@
|
|||||||
Version 2.03.06 -
|
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.
|
Rename LV converted to cachevol to use _cvol suffix.
|
||||||
Use normal LVs for wiping of cachevols.
|
Use normal LVs for wiping of cachevols.
|
||||||
Reload cleanered cache DM only with cleaner policy.
|
Reload cleanered cache DM only with cleaner policy.
|
||||||
|
@ -46,7 +46,7 @@ typedef enum {
|
|||||||
} action_t;
|
} action_t;
|
||||||
|
|
||||||
/* This list must match lib/misc/lvm-string.c:build_dm_uuid(). */
|
/* 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 dlid_list {
|
||||||
struct dm_list list;
|
struct dm_list list;
|
||||||
|
@ -157,6 +157,7 @@ static const char *_lvname_has_reserved_component_string(const char *lvname)
|
|||||||
"_cdata",
|
"_cdata",
|
||||||
"_cmeta",
|
"_cmeta",
|
||||||
"_corig",
|
"_corig",
|
||||||
|
"_cvol",
|
||||||
"_wcorig",
|
"_wcorig",
|
||||||
"_mimage",
|
"_mimage",
|
||||||
"_mlog",
|
"_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(lv) && lv_is_pending_delete(lv)) ? "real" :
|
||||||
lv_is_cache_pool_data(lv) ? "cdata" :
|
lv_is_cache_pool_data(lv) ? "cdata" :
|
||||||
lv_is_cache_pool_metadata(lv) ? "cmeta" :
|
lv_is_cache_pool_metadata(lv) ? "cmeta" :
|
||||||
|
lv_is_cache_vol(lv) ? "cvol" :
|
||||||
// FIXME: dm-tree needs fixes for mirrors/raids
|
// FIXME: dm-tree needs fixes for mirrors/raids
|
||||||
//lv_is_mirror_image(lv) ? "mimage" :
|
//lv_is_mirror_image(lv) ? "mimage" :
|
||||||
//lv_is_mirror_log(lv) ? "mlog" :
|
//lv_is_mirror_log(lv) ? "mlog" :
|
||||||
|
@ -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")))
|
if (!(origin_uuid = build_dm_uuid(mem, seg_lv(seg, 0), "real")))
|
||||||
return_0;
|
return_0;
|
||||||
|
|
||||||
if (!(fast_uuid = build_dm_uuid(mem, seg->writecache, NULL)))
|
if (!(fast_uuid = build_dm_uuid(mem, seg->writecache, "cvol")))
|
||||||
return_0;
|
return_0;
|
||||||
|
|
||||||
if (!dm_tree_node_add_writecache_target(node, len,
|
if (!dm_tree_node_add_writecache_target(node, len,
|
||||||
|
Loading…
Reference in New Issue
Block a user