[Evms-cvs-commits] evms2/engine/plugins/md raid1_discover.c,1.41,1.42

[Mike T. <mik...@us...>]

Update of /cvsroot/evms/evms2/engine/plugins/md
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3235

Modified Files:
	raid1_discover.c 
Log Message:
For an existing RAID1 region, the smallest size is the size recorded in
the MD superblock.


Index: raid1_discover.c
===================================================================
RCS file: /cvsroot/evms/evms2/engine/plugins/md/raid1_discover.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- raid1_discover.c	17 Sep 2004 16:23:45 -0000	1.41
+++ raid1_discover.c	26 Oct 2004 21:17:24 -0000	1.42
@@ -78,11 +78,15 @@
 	int i, found;
 
 	LOG_ENTRY();
-	for (i = 0, found=0; (i < MAX_MD_DEVICES) && (found < volume->nr_disks); i++) {
-		if (volume->child_object[i]) {
-			found++;
-			size = MD_NEW_SIZE_SECTORS(volume->child_object[i]->size);
-			smallest = min(smallest, size);
+	if (volume->super_block) {
+		smallest = volume->super_block->size * 2;
+	} else {
+		for (i = 0, found=0; (i < MAX_MD_DEVICES) && (found < volume->nr_disks); i++) {
+			if (volume->child_object[i]) {
+				found++;
+				size = MD_NEW_SIZE_SECTORS(volume->child_object[i]->size);
+				smallest = min(smallest, size);
+			}
 		}
 	}
 	LOG_EXIT_INT((int)smallest);