SOURCES: mdadm-degraded.patch - updated

[arekm]

Author: arekm                        Date: Sat Sep  3 22:26:41 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   mdadm-degraded.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mdadm-degraded.patch
diff -u SOURCES/mdadm-degraded.patch:1.1 SOURCES/mdadm-degraded.patch:1.2
--- SOURCES/mdadm-degraded.patch:1.1	Tue Jul 13 11:57:50 2004
+++ SOURCES/mdadm-degraded.patch	Sun Sep  4 00:26:35 2005
@@ -1,21 +1,26 @@
---- mdadm-1.6.0/Assemble.c.orig	Fri Jun  4 08:18:28 2004
-+++ mdadm-1.6.0/Assemble.c	Tue Jul 13 10:33:52 2004
-@@ -253,14 +253,14 @@
+diff -urN mdadm-2.0.org/Assemble.c mdadm-2.0/Assemble.c
+--- mdadm-2.0.org/Assemble.c	2005-08-15 08:31:57.000000000 +0200
++++ mdadm-2.0/Assemble.c	2005-09-04 00:25:53.575606024 +0200
+@@ -262,18 +262,15 @@
  		 */
  
- 		if (!havesuper) {
+ 		if (!super) {
 -			fprintf(stderr, Name ": %s has no superblock - assembly aborted\n",
 +			fprintf(stderr, Name ": %s has no superblock - device ignored\n",
  				devname);
+-			free(first_super);
 -			return 1;
 +			continue;
  		}
- 		if (compare_super(&first_super, &super)) {
+ 		st = tst; /* commit to this format, if haven't already */
+ 		if (st->ss->compare_super(&first_super, super)) {
 -			fprintf(stderr, Name ": superblock on %s doesn't match others - assembly aborted\n",
 +			fprintf(stderr, Name ": superblock on %s doesn't match others - device ignored\n",
  				devname);
+-			free(super);
+-			free(first_super);
 -			return 1;
 +			continue;
  		}
  
- 
+ 		/* looks like a good enough match to update the super block if needed */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mdadm-degraded.patch?r1=1.1&r2=1.2&f=u