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

cleanup: use display_lvname in pmspare

Browse Source 
Just switch to use display_lvname().
Also squeeze possibly failing strncpy into INTERNAL_ERROR
as lvname always should fit.
This commit is contained in:
Zdenek Kabelac 2015-11-18 09:14:24 +01:00
parent 0a2cadf6b8
commit e2b00b0a89
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/metadata/pool_manip.c
View File

@ -709,7 +709,7 @@ int vg_remove_pool_metadata_spare(struct volume_group *vg)
if (!(lv->status & POOL_METADATA_SPARE)) {
log_error(INTERNAL_ERROR "LV %s is not pool metadata spare.",
lv->name);
display_lvname(lv));
return 0;
}
@ -718,10 +718,10 @@ int vg_remove_pool_metadata_spare(struct volume_group *vg)
lv_set_visible(lv);
/* Cut off suffix _pmspare */
(void) dm_strncpy(new_name, lv->name, sizeof(new_name));
if (!(c = strchr(new_name, '_'))) {
if (!dm_strncpy(new_name, lv->name, sizeof(new_name)) ||
!(c = strchr(new_name, '_'))) {
log_error(INTERNAL_ERROR "LV %s has no suffix for pool metadata spare.",
new_name);
display_lvname(lv));
return 0;
}
*c = 0;
@ -735,8 +735,8 @@ int vg_remove_pool_metadata_spare(struct volume_group *vg)
}
log_print_unless_silent("Renaming existing pool metadata spare "
"logical volume \"%s/%s\" to \"%s/%s\".",
vg->name, lv->name, vg->name, new_name);
"logical volume \"%s\" to \"%s/%s\".",
display_lvname(lv), vg->name, new_name);
if (!lv_rename_update(vg->cmd, lv, new_name, 0))
return_0;