From 2f00f4a9dc4d00afb8067d674bf7bbc26f732f07938954aec7bf824862070088 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Thu, 26 Jun 2014 03:46:07 +0000 Subject: [PATCH] - 0001-Grow-fix-removal-of-line-in-wrong-case.patch (bnc#881530) OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=114 --- ...ow-fix-removal-of-line-in-wrong-case.patch | 39 +++++++++++++++++++ mdadm.changes | 6 +++ mdadm.spec | 3 ++ 3 files changed, 48 insertions(+) create mode 100644 0001-Grow-fix-removal-of-line-in-wrong-case.patch diff --git a/0001-Grow-fix-removal-of-line-in-wrong-case.patch b/0001-Grow-fix-removal-of-line-in-wrong-case.patch new file mode 100644 index 0000000..2ab694f --- /dev/null +++ b/0001-Grow-fix-removal-of-line-in-wrong-case.patch @@ -0,0 +1,39 @@ +From e339dba2a1744dc6860a58e286ded39fc993c2db Mon Sep 17 00:00:00 2001 +From: Pawel Baldysiak +Date: Wed, 11 Jun 2014 15:18:44 +0000 +Subject: [PATCH] Grow: fix removal of line in wrong case + +Commit 18d9bcfa33939cee345d4d7735bc6081bcc409c8 +removed wrong line (in case RAID0->RAID4). +This patch corrects this mistake +(line should be removed in case RAID4->RAID4). + +Signed-off-by: Pawel Baldysiak +Signed-off-by: NeilBrown +--- + Grow.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Grow.c b/Grow.c +index 12730e26fd19..a2f4f1428787 100644 +--- a/Grow.c ++++ b/Grow.c +@@ -1324,6 +1324,7 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) + + switch (re->level) { + case 4: ++ re->before.layout = 0; + re->after.layout = 0; + break; + case 5: +@@ -1339,7 +1340,6 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) + + switch (re->level) { + case 4: +- re->before.layout = 0; + re->after.layout = 0; + break; + case 5: +-- +2.0.0 + diff --git a/mdadm.changes b/mdadm.changes index cc75d03..d2b3a47 100644 --- a/mdadm.changes +++ b/mdadm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 26 03:08:15 UTC 2014 - nfbrown@suse.com + +- 0001-Grow-fix-removal-of-line-in-wrong-case.patch + (bnc#881530) + ------------------------------------------------------------------- Thu Jun 26 02:54:05 UTC 2014 - nfbrown@suse.com diff --git a/mdadm.spec b/mdadm.spec index 2568e64..7e64c80 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -42,6 +42,8 @@ Source6: mkinitrd-boot.sh Source7: mdadm.cron # PATCH-FIX-UPSTREAM 0001-Makefile-install-mdadm-grow-continue-.service.patch nfbrown@suse.de Patch1: 0001-Makefile-install-mdadm-grow-continue-.service.patch +# PATCH-FIX-UPSTREAM 0001-Grow-fix-removal-of-line-in-wrong-case.patch bnc#881530 nfbrown@suse.de +Patch2: 0001-Grow-fix-removal-of-line-in-wrong-case.patch %define _udevdir %(pkg-config --variable=udevdir udev) %define _systemdshutdowndir %{_unitdir}/../system-shutdown @@ -54,6 +56,7 @@ programs but with a very different interface. %prep %setup -q -a1 %patch1 -p1 +%patch2 -p1 %build make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error" SUSE=yes