Attachment #63832 for bug #99605

Lines 129-136 Link Here

(-)LVM.orig/1.0.7/tools/lib/pv_read_all_pv_of_vg.c (-1 / +1 lines)
129	UUID_LEN) == 0) goto uuid_check_end;	129	UUID_LEN) == 0) goto uuid_check_end;
130	}	130	}
131	pv_this[p] = NULL;	131	pv_this[p] = NULL;
132	uuid_check_end:
133	}	132	}
		133	uuid_check_end:
134	for ( pp = 0; pp < p - 2; pp++) {	134	for ( pp = 0; pp < p - 2; pp++) {
135	if ( pv_this[pp] == NULL) {	135	if ( pv_this[pp] == NULL) {
136	pv_this[pp] = pv_this[pp+1];	136	pv_this[pp] = pv_this[pp+1];

Lines 50-56 Link Here

(-)LVM.orig/1.0.7/tools/lib/pv_read_uuidlist.c (-1 / +1 lines)
50	static char *this_pv_uuidlist = NULL;	50	static char *this_pv_uuidlist = NULL;
51	int num;	51	int num;
52		52
53	debug_enter(__FUNCTION__ " -- CALLED with %s\n", pv ? pv->pv_name : "NULL");	53	debug_enter(__FUNCTION__, " -- CALLED with %s\n", pv ? pv->pv_name : "NULL");
54		54
55	if (pv == NULL \|\| pv_uuidlist == NULL)	55	if (pv == NULL \|\| pv_uuidlist == NULL)
56	return -LVM_EPARAM;	56	return -LVM_EPARAM;

Lines 71-77 Link Here

(-)LVM.orig/1.0.7/tools/lib/pv_write_uuidlist.c (-1 / +1 lines)
71		71
72	/* Create/fix UUIDs for any PVs that need it */	72	/* Create/fix UUIDs for any PVs that need it */
73	if (lvm_check_uuid(pv->pv_uuid) < 0) {	73	if (lvm_check_uuid(pv->pv_uuid) < 0) {
74	debug(__FUNCTION__ " -- creating new UUID for PV %s\n",	74	debug(__FUNCTION__, " -- creating new UUID for PV %s\n",
75	pv->pv_name);	75	pv->pv_name);
76	memset(pv->pv_uuid, 0, sizeof(pv->pv_uuid));	76	memset(pv->pv_uuid, 0, sizeof(pv->pv_uuid));
77	memcpy(pv->pv_uuid, lvm_create_uuid(UUID_LEN), UUID_LEN);	77	memcpy(pv->pv_uuid, lvm_create_uuid(UUID_LEN), UUID_LEN);

Return to bug 99605