- Update to head of upstream git repo, which contains a significant number

of bug fixes we need
This commit is contained in:
Doug Ledford 2010-02-18 06:42:33 +00:00
parent 5ded3b2fef
commit 9d56628903
3 changed files with 34 additions and 5 deletions

13
mdadm-3.1.1-endian.patch Normal file
View File

@ -0,0 +1,13 @@
--- 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",
};

View File

@ -1,5 +1,5 @@
--- mdadm-3.1.1/Grow.c.warn 2010-02-08 01:26:18.000000000 -0500 --- mdadm-3.1.1/Grow.c.warn 2010-02-08 01:26:18.000000000 -0500
+++ mdadm-3.1.1/Grow.c 2010-02-17 14:18:45.172678440 -0500 +++ mdadm-3.1.1/Grow.c 2010-02-17 14:58:43.615427833 -0500
@@ -1096,7 +1096,7 @@ int Grow_reshape(char *devname, int fd, @@ -1096,7 +1096,7 @@ int Grow_reshape(char *devname, int fd,
/* set them all just in case some old 'new_*' value /* set them all just in case some old 'new_*' value
* persists from some earlier problem * persists from some earlier problem
@ -115,7 +115,7 @@
sysfs_set_num(sra, NULL, "suspend_lo", 0); sysfs_set_num(sra, NULL, "suspend_lo", 0);
sysfs_set_num(sra, NULL, "suspend_hi", 0); sysfs_set_num(sra, NULL, "suspend_hi", 0);
--- mdadm-3.1.1/restripe.c.warn 2010-02-08 01:26:18.000000000 -0500 --- mdadm-3.1.1/restripe.c.warn 2010-02-08 01:26:18.000000000 -0500
+++ mdadm-3.1.1/restripe.c 2010-02-17 14:18:45.173602297 -0500 +++ mdadm-3.1.1/restripe.c 2010-02-17 14:58:43.615427833 -0500
@@ -565,7 +565,10 @@ int restore_stripes(int *dest, unsigned @@ -565,7 +565,10 @@ int restore_stripes(int *dest, unsigned
int data_disks = raid_disks - (level == 0 ? 0 : level <= 5 ? 1 : 2); int data_disks = raid_disks - (level == 0 ? 0 : level <= 5 ? 1 : 2);
@ -128,8 +128,8 @@
if (zero == NULL) { if (zero == NULL) {
zero = malloc(chunk_size); zero = malloc(chunk_size);
if (zero) if (zero)
--- mdadm-3.1.1/mdmon.c.warn 2010-02-17 14:19:09.147678574 -0500 --- mdadm-3.1.1/mdmon.c.warn 2010-02-08 01:26:18.000000000 -0500
+++ mdadm-3.1.1/mdmon.c 2010-02-17 14:19:40.578678567 -0500 +++ mdadm-3.1.1/mdmon.c 2010-02-17 14:58:43.616427642 -0500
@@ -176,7 +176,7 @@ static void try_kill_monitor(pid_t pid, @@ -176,7 +176,7 @@ static void try_kill_monitor(pid_t pid,
fl = fcntl(sock, F_GETFL, 0); fl = fcntl(sock, F_GETFL, 0);
fl &= ~O_NONBLOCK; fl &= ~O_NONBLOCK;
@ -139,3 +139,14 @@
} }
void remove_pidfile(char *devname) void remove_pidfile(char *devname)
--- mdadm-3.1.1/super-intel.c.warn 2010-02-17 14:59:16.757425375 -0500
+++ mdadm-3.1.1/super-intel.c 2010-02-17 15:00:15.309803578 -0500
@@ -698,7 +698,7 @@ static void print_imsm_dev(struct imsm_d
printf(" <-- %s", map_state_str[map->map_state]);
printf("\n Checkpoint : %u (%llu)",
__le32_to_cpu(dev->vol.curr_migr_unit),
- blocks_per_migr_unit(dev));
+ (unsigned long long)blocks_per_migr_unit(dev));
}
printf("\n");
printf(" Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean");

View File

@ -1,7 +1,7 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays) Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm Name: mdadm
Version: 3.1.1 Version: 3.1.1
Release: 0.gcd9a8b5.1%{?dist} Release: 0.gcd9a8b5.2%{?dist}
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2 Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-gcd9a8b5.tar.bz2
Source1: mdmonitor.init Source1: mdmonitor.init
Source2: raid-check Source2: raid-check
@ -9,6 +9,7 @@ Source3: mdadm.rules
Source4: mdadm-raid-check-sysconfig Source4: mdadm-raid-check-sysconfig
Patch1: mdadm-2.5.2-static.patch Patch1: mdadm-2.5.2-static.patch
Patch2: mdadm-3.1.1-warn.patch Patch2: mdadm-3.1.1-warn.patch
Patch3: mdadm-3.1.1-endian.patch
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
@ -31,6 +32,7 @@ file can be used to help with some common tasks.
%setup -q %setup -q
%patch1 -p1 -b .static %patch1 -p1 -b .static
%patch2 -p1 -b .warn %patch2 -p1 -b .warn
%patch3 -p1 -b .endian
%build %build
make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" SYSCONFDIR="%{_sysconfdir}" mdadm.static mdadm mdmon
@ -77,6 +79,9 @@ fi
%attr(0700,root,root) %dir /var/run/mdadm %attr(0700,root,root) %dir /var/run/mdadm
%changelog %changelog
* Thu Feb 18 2010 Doug Ledford <dledford@redhat.com> - 3.1.1-0.gcd9a8b5.2
- Fix s390/ppc64 UUID byte swap issue
* Wed Feb 17 2010 Doug Ledford <dledford@redhat.com> - 3.1.1-0.gcd9a8b5.1 * Wed Feb 17 2010 Doug Ledford <dledford@redhat.com> - 3.1.1-0.gcd9a8b5.1
- Update to head of upstream git repo, which contains a significant number - Update to head of upstream git repo, which contains a significant number
of bug fixes we need of bug fixes we need