r116 - in lvm2/trunk: lib/format1 tools

[Bastian Blank]

Author: waldi
Date: Wed Jun 22 16:49:15 2005
New Revision: 116

Modified:
   lvm2/trunk/lib/format1/import-export.c
   lvm2/trunk/tools/lvcreate.c
Log:
lib/format1/import-export.c, tools/lvcreate.c: Fix lvm1 metadata support.


Modified: lvm2/trunk/lib/format1/import-export.c
==============================================================================
--- lvm2/trunk/lib/format1/import-export.c	(original)
+++ lvm2/trunk/lib/format1/import-export.c	Wed Jun 22 16:49:15 2005
@@ -241,7 +241,7 @@
 
 	vg->extent_size = vgd->pe_size;
 	vg->extent_count = vgd->pe_total;
-	vg->free_count = vgd->pe_total - vgd->pe_allocated;
+	vg->free_count = vgd->pe_total;
 	vg->max_lv = vgd->lv_max;
 	vg->max_pv = vgd->pv_max;
 	vg->alloc = ALLOC_NORMAL;

Modified: lvm2/trunk/tools/lvcreate.c
==============================================================================
--- lvm2/trunk/tools/lvcreate.c	(original)
+++ lvm2/trunk/tools/lvcreate.c	Wed Jun 22 16:49:15 2005
@@ -497,7 +497,7 @@
 		return 0;
 	}
 
-	if (lp->mirrors && !(vg->fid->fmt->features & FMT_SEGMENTS)) {
+	if (lp->mirrors > 1 && !(vg->fid->fmt->features & FMT_SEGMENTS)) {
 		log_error("Metadata does not support mirroring.");
 		return 0;
 	}