Hello community,

here is the log from the commit of package mdadm for openSUSE:Factory checked 
in at 2018-03-07 10:30:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mdadm (Old)
 and      /work/SRC/openSUSE:Factory/.mdadm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mdadm"

Wed Mar  7 10:30:13 2018 rev:115 rq:582467 version:4.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/mdadm/mdadm.changes      2018-02-12 
10:25:05.992146351 +0100
+++ /work/SRC/openSUSE:Factory/.mdadm.new/mdadm.changes 2018-03-07 
10:30:15.692036118 +0100
@@ -1,0 +2,7 @@
+Mon Mar  5 03:25:18 UTC 2018 - gqji...@suse.com
+
+- mdadm: allow clustered raid10 to be created with default layout
+  (bsc#1083881)
+  0210-mdadm-allow-clustered-raid10-to-be-created-with-defa.patch
+
+-------------------------------------------------------------------

New:
----
  0210-mdadm-allow-clustered-raid10-to-be-created-with-defa.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mdadm.spec ++++++
--- /var/tmp/diff_new_pack.6u1S0K/_old  2018-03-07 10:30:19.287906411 +0100
+++ /var/tmp/diff_new_pack.6u1S0K/_new  2018-03-07 10:30:19.291906267 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package mdadm
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -252,6 +252,7 @@
 Patch207:       0207-managemon-Don-t-add-disk-to-the-array-after-it-has-s.patch
 Patch208:       0208-mdadm-grow-correct-the-s-size-1-to-make-max-work.patch
 Patch209:       0209-policy.c-Avoid-to-take-spare-without-defined-domain-.patch
+Patch210:       0210-mdadm-allow-clustered-raid10-to-be-created-with-defa.patch
 
 %define _udevdir %(pkg-config --variable=udevdir udev)
 %define _systemdshutdowndir %{_unitdir}/../system-shutdown
@@ -471,6 +472,7 @@
 %patch207 -p1
 %patch208 -p1
 %patch209 -p1
+%patch210 -p1
 
 %build
 make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error" SUSE=yes

++++++ 0210-mdadm-allow-clustered-raid10-to-be-created-with-defa.patch ++++++
>From 18160d345536b88419785c5e408cce402d9db2ae Mon Sep 17 00:00:00 2001
From: Guoqing Jiang <gqji...@suse.com>
Date: Wed, 3 Jan 2018 15:01:22 +0800
Subject: [PATCH] mdadm: allow clustered raid10 to be created with default
 layout
Git-commit: 18160d345536b88419785c5e408cce402d9db2ae
Patch-mainline: mdadm-4.0+
References: bsc#1083881

Since the default layout of raid10 is n2, so we
should allow the behavior.

Signed-off-by: Guoqing Jiang <gqji...@suse.com>
Signed-off-by: Jes Sorensen <jsoren...@fb.com>
---
 mdadm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mdadm.c b/mdadm.c
index 62d7ec34a17f..afc3015144d3 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -1547,7 +1547,7 @@ int main(int argc, char *argv[])
                                rv = 1;
                                break;
                        }
-                       if (s.level == 10 && !is_near_layout_10(s.layout)) {
+                       if (s.level == 10 && !(is_near_layout_10(s.layout) || 
s.layout == UnSet)) {
                                pr_err("only near layout is supported with 
clustered raid10\n");
                                rv = 1;
                                break;
-- 
2.10.0


Reply via email to