rpms/mdadm/devel mdadm-3.1.3-read.patch, NONE, 1.1 mdadm.spec, 1.95, 1.96

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26257

Modified Files:
	mdadm.spec 
Added Files:
	mdadm-3.1.3-read.patch 
Log Message:
* Tue Jul 20 2010 Doug Ledford <dledford at redhat.com> - 3.1.3-0.git07202010.1
- Update to latest git repo (3.1.2 plus pending changes, fixes bz602457)
- Add in 64-md-raid.rules to compensate for it no longer being in udev
  (bz581905)
- Remove mdadm.static as its no longer used in initrd creation


mdadm-3.1.3-read.patch:
 Grow.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mdadm-3.1.3-read.patch ---
--- mdadm-3.1.3-git07202010/Grow.c.read	2010-07-20 12:18:12.000000000 -0400
+++ mdadm-3.1.3-git07202010/Grow.c	2010-07-20 12:55:26.816805170 -0400
@@ -1820,7 +1820,7 @@ int Grow_restart(struct supertype *st, s
 		}
 		/* There should be a duplicate backup superblock 4k before here */
 		if (lseek64(fd, -4096, 1) < 0 ||
-		    read(fd, &bsb2, 4096) != 4096)
+		    read(fd, &bsb2, sizeof(bsb2)) != sizeof(bsb2))
 			goto second_fail; /* Cannot find leading superblock */
 		if (bsb.magic[15] == '1')
 			bsbsize = offsetof(struct mdp_backup_super, pad1);


Index: mdadm.spec
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdadm.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- mdadm.spec	20 Jul 2010 16:45:36 -0000	1.95
+++ mdadm.spec	20 Jul 2010 16:57:55 -0000	1.96
@@ -7,6 +7,7 @@ Source1:     mdmonitor.init
 Source2:     raid-check
 Source3:     mdadm.rules
 Source4:     mdadm-raid-check-sysconfig
+Patch0:      mdadm-3.1.3-read.patch
 Patch20:     mdadm-2.5.2-static.patch
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
@@ -28,6 +29,7 @@ file can be used to help with some commo
 
 %prep
 %setup -q -n mdadm-3.1.3-git07202010
+%patch0 -p1 -b .read
 %patch20 -p1 -b .static
 
 %build