shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

raid: Avoid double suffix on rmeta LV name paired with rimage LV.

Browse Source
This commit is contained in:
Alasdair G Kergon 2016-08-11 23:31:49 +01:00
parent e30fb19030
commit 93b61c07eb
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.164 - Version 2.02.164 -
=================================== ===================================
Avoid double suffix when naming _rmeta LV paired with _rimage LV.
Version 2.02.163 - 10th August 2016 Version 2.02.163 - 10th August 2016
=================================== ===================================

23
lib/metadata/raid_manip.c
View File

@ -108,6 +108,22 @@ static void _check_and_adjust_region_size(const struct logical_volume *lv)
return _ensure_min_region_size(lv); return _ensure_min_region_size(lv);
} }
/* Strip any raid suffix off LV name */
static char *_top_level_raid_lv_name(struct logical_volume *lv)
{
char *new_lv_name, *suffix;
if (!(new_lv_name = dm_pool_strdup(lv->vg->vgmem, lv->name))) {
log_error("Failed to allocate string for new LV name.");
return NULL;
}
if ((suffix = first_substring(new_lv_name, "_rimage_", "_mimage_", NULL)))
*suffix = '\0';
return new_lv_name;
}
static int _lv_is_raid_with_tracking(const struct logical_volume *lv, static int _lv_is_raid_with_tracking(const struct logical_volume *lv,
struct logical_volume **tracking) struct logical_volume **tracking)
{ {
@ -679,7 +695,7 @@ static int _alloc_rmeta_for_lv(struct logical_volume *data_lv,
struct dm_list allocatable_pvs; struct dm_list allocatable_pvs;
struct alloc_handle *ah; struct alloc_handle *ah;
struct lv_segment *seg = first_seg(data_lv); struct lv_segment *seg = first_seg(data_lv);
char *p, base_name[NAME_LEN]; char *base_name;
dm_list_init(&allocatable_pvs); dm_list_init(&allocatable_pvs);
@ -699,9 +715,8 @@ static int _alloc_rmeta_for_lv(struct logical_volume *data_lv,
return 0; return 0;
} }
(void) dm_strncpy(base_name, data_lv->name, sizeof(base_name)); if (!(base_name = _top_level_raid_lv_name(data_lv)))
if ((p = strstr(base_name, "_mimage_"))) return_0;
*p = '\0';
if (!(ah = allocate_extents(data_lv->vg, NULL, seg->segtype, 0, 1, 0, if (!(ah = allocate_extents(data_lv->vg, NULL, seg->segtype, 0, 1, 0,
seg->region_size, seg->region_size,