rpms/mdadm/F-12 mdadm-3.1.1-endian.patch, 1.1, 1.2 mdadm.spec, 1.79, 1.80

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16322

Modified Files:
	mdadm-3.1.1-endian.patch mdadm.spec 
Log Message:
* Sun Feb 21 2010 Doug Ledford <dledford at redhat.com> - 3.1.1-0.gcd9a8b5.5
- The uuid patch cause a different problem during assembly, so use a gross
  hack to work around the uuid issue that won't break assembly until fixed
  properly upstream (bz567132)


mdadm-3.1.1-endian.patch:
 util.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: mdadm-3.1.1-endian.patch
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/mdadm-3.1.1-endian.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mdadm-3.1.1-endian.patch	19 Feb 2010 23:36:56 -0000	1.1
+++ mdadm-3.1.1-endian.patch	22 Feb 2010 00:28:11 -0000	1.2
@@ -1,13 +1,16 @@
---- mdadm-3.1.1/super1.c.endian	2010-02-18 01:39:56.079803165 -0500
-+++ mdadm-3.1.1/super1.c	2010-02-18 01:40:07.973803550 -0500
-@@ -1667,10 +1667,6 @@ struct superswitch super1 = {
- 	.locate_bitmap = locate_bitmap1,
- 	.write_bitmap = write_bitmap1,
- 	.free_super = free_super1,
--#if __BYTE_ORDER == BIG_ENDIAN
--	.swapuuid = 0,
--#else
- 	.swapuuid = 1,
--#endif
- 	.name = "1.x",
- };
+--- mdadm-3.1.1/util.c.endian	2010-02-21 19:13:56.253610477 -0500
++++ mdadm-3.1.1/util.c	2010-02-21 19:16:26.338375501 -0500
+@@ -395,7 +395,12 @@ char *__fname_from_uuid(int id[4], int s
+ 
+ char *fname_from_uuid(struct supertype *st, struct mdinfo *info, char *buf, char sep)
+ {
+-	return __fname_from_uuid(info->uuid, st->ss->swapuuid, buf, sep);
++	// dirty hack to work around an issue with super1 superblocks...
++	// super1 superblocks need swapuuid set in order for assembly to
++	// work, but can't have it set if we want this printout to match
++	// all the other uuid printouts in super1.c, so we force swapuuid
++	// to 1 to make our printout match the rest of super1
++	return __fname_from_uuid(info->uuid, (st->ss == &super1) ? 1 : st->ss->swapuuid, buf, sep);
+ }
+ 
+ #ifndef MDASSEMBLE


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/F-12/mdadm.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- mdadm.spec	21 Feb 2010 15:31:51 -0000	1.79
+++ mdadm.spec	22 Feb 2010 00:28:11 -0000	1.80
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.1.1
-Release:     0.gcd9a8b5.4%{?dist}
+Release:     0.gcd9a8b5.5%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -81,6 +81,11 @@ fi
 %attr(0700,root,root) %dir /var/run/mdadm
 
 %changelog
+* Sun Feb 21 2010 Doug Ledford <dledford at redhat.com> - 3.1.1-0.gcd9a8b5.5
+- The uuid patch cause a different problem during assembly, so use a gross
+  hack to work around the uuid issue that won't break assembly until fixed
+  properly upstream (bz567132)
+
 * Sun Feb 21 2010 Doug Ledford <dledford at redhat.com> - 3.1.1-0.gcd9a8b5.4
 - Fix problem with booting multiple imsm containers when they aren't listed
   "just so" in the mdadm.conf file (bz554974)