shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

cache: rename variable in _cache_add_target_line

Browse Source 
so it is not specific to lv/seg type
This commit is contained in:
David Teigland 2018-11-05 16:05:28 -06:00
parent 7541e002b2
commit 5ee1727f80
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/cache_segtype/cache.c
View File

@ -543,6 +543,7 @@ static int _cache_add_target_line(struct dev_manager *dm,
uint32_t *pvmove_mirror_count __attribute__((unused))) uint32_t *pvmove_mirror_count __attribute__((unused)))
{ {
struct lv_segment *cache_pool_seg; struct lv_segment *cache_pool_seg;
struct lv_segment *setting_seg;
char *metadata_uuid, *data_uuid, *origin_uuid; char *metadata_uuid, *data_uuid, *origin_uuid;
uint64_t feature_flags = 0; uint64_t feature_flags = 0;
unsigned attr; unsigned attr;
@ -552,15 +553,20 @@ static int _cache_add_target_line(struct dev_manager *dm,
return 0; return 0;
} }
log_debug("cache_add_target_line lv %s pool %s", seg->lv->name, seg->pool_lv->name);
cache_pool_seg = first_seg(seg->pool_lv); cache_pool_seg = first_seg(seg->pool_lv);
setting_seg = cache_pool_seg;
if (seg->cleaner_policy) if (seg->cleaner_policy)
/* With cleaner policy always pass writethrough */ /* With cleaner policy always pass writethrough */
feature_flags |= DM_CACHE_FEATURE_WRITETHROUGH; feature_flags |= DM_CACHE_FEATURE_WRITETHROUGH;
else else
switch (cache_pool_seg->cache_mode) { switch (setting_seg->cache_mode) {
default: default:
log_error(INTERNAL_ERROR "LV %s has unknown cache mode %d.", log_error(INTERNAL_ERROR "LV %s has unknown cache mode %d.",
display_lvname(seg->lv), cache_pool_seg->cache_mode); display_lvname(seg->lv), setting_seg->cache_mode);
/* Fall through */ /* Fall through */
case CACHE_MODE_WRITETHROUGH: case CACHE_MODE_WRITETHROUGH:
feature_flags |= DM_CACHE_FEATURE_WRITETHROUGH; feature_flags |= DM_CACHE_FEATURE_WRITETHROUGH;
@ -573,7 +579,7 @@ static int _cache_add_target_line(struct dev_manager *dm,
break; break;
} }
switch (cache_pool_seg->cache_metadata_format) { switch (setting_seg->cache_metadata_format) {
case CACHE_METADATA_FORMAT_1: break; case CACHE_METADATA_FORMAT_1: break;
case CACHE_METADATA_FORMAT_2: case CACHE_METADATA_FORMAT_2:
if (!_target_present(cmd, NULL, &attr)) if (!_target_present(cmd, NULL, &attr))
@ -581,7 +587,7 @@ static int _cache_add_target_line(struct dev_manager *dm,
if (!(attr & CACHE_FEATURE_METADATA2)) { if (!(attr & CACHE_FEATURE_METADATA2)) {
log_error("LV %s has metadata format %u unsuported by kernel.", log_error("LV %s has metadata format %u unsuported by kernel.",
display_lvname(seg->lv), cache_pool_seg->cache_metadata_format); display_lvname(seg->lv), setting_seg->cache_metadata_format);
return 0; return 0;
} }
feature_flags |= DM_CACHE_FEATURE_METADATA2; feature_flags |= DM_CACHE_FEATURE_METADATA2;
@ -589,7 +595,7 @@ static int _cache_add_target_line(struct dev_manager *dm,
break; break;
default: default:
log_error(INTERNAL_ERROR "LV %s has unknown metadata format %u.", log_error(INTERNAL_ERROR "LV %s has unknown metadata format %u.",
display_lvname(seg->lv), cache_pool_seg->cache_metadata_format); display_lvname(seg->lv), setting_seg->cache_metadata_format);
return 0; return 0;
} }