summaryrefslogtreecommitdiffstats
path: root/tools/vgmerge.c
diff options
context:
space:
mode:
authorJoe Thornber <thornber@redhat.com>2002-01-21 16:49:32 +0000
committerJoe Thornber <thornber@redhat.com>2002-01-21 16:49:32 +0000
commitf868d63582d5964fe2e3cbfd40362b31333d754b (patch)
treeb665d7ce1344ddb815522c510817daa6491b8959 /tools/vgmerge.c
parentb926605531d8142519ef51a37e69864958f9849b (diff)
downloadlvm2-f868d63582d5964fe2e3cbfd40362b31333d754b.tar.gz
lvm2-f868d63582d5964fe2e3cbfd40362b31333d754b.tar.xz
lvm2-f868d63582d5964fe2e3cbfd40362b31333d754b.zip
o Similar changes for lv_list.
Diffstat (limited to 'tools/vgmerge.c')
-rw-r--r--tools/vgmerge.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/vgmerge.c b/tools/vgmerge.c
index 170e725a..08c98d92 100644
--- a/tools/vgmerge.c
+++ b/tools/vgmerge.c
@@ -70,7 +70,7 @@ int vgmerge_single(const char *vg_name_to, const char *vg_name_from)
}
if ((active = lvs_in_vg_activated(vg_from))) {
- log_error("Logical volumes in %s must be inactive",
+ log_error("Logical volumes in %s must be inactive",
vg_name_from);
return ECMD_FAILED;
}
@@ -100,8 +100,11 @@ int vgmerge_single(const char *vg_name_to, const char *vg_name_from)
/* Check no conflicts with LV names */
list_iterate(lvh1, &vg_to->lvs) {
list_iterate(lvh2, &vg_from->lvs) {
- char *name1 = list_item(lvh1, struct lv_list)->lv.name;
- char *name2 = list_item(lvh2, struct lv_list)->lv.name;
+ char *name1 = list_item(lvh1,
+ struct lv_list)->lv->name;
+
+ char *name2 = list_item(lvh2,
+ struct lv_list)->lv->name;
if (!strcmp(name1, name2)) {
log_error("Duplicate logical volume name %s "
"in %s and %s", name1, vg_to->name,