pool/mdadm
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- 0001-Grow-fix-removal-of-line-in-wrong-case.patch

Browse Source 
(bnc#881530)

OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=114
This commit is contained in:
Neil Brown 2014-06-26 03:46:07 +00:00 committed by Git OBS Bridge
parent 84bbd33f6a
commit 2f00f4a9dc
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-Grow-fix-removal-of-line-in-wrong-case.patch Normal file
View File

@ -0,0 +1,39 @@
From e339dba2a1744dc6860a58e286ded39fc993c2db Mon Sep 17 00:00:00 2001
From: Pawel Baldysiak <pawel.baldysiak@intel.com>
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 <pawel.baldysiak@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---
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

6
mdadm.changes
View File

@ -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

3
mdadm.spec
View File

@ -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