245f9b044a
Now there are some patches after 4.1-rc1 and include them in this time too. So we update to latest upstream version this time. Resolves: bz1556591 Signed-off-by: Xiao Ni <xni@redhat.com>
104 lines
3.3 KiB
Diff
104 lines
3.3 KiB
Diff
From d7d48046311693d0300bbf47ceddfe9db5fdb461 Mon Sep 17 00:00:00 2001
|
|
From: Xiao Ni <xni@redhat.com>
|
|
Date: Fri, 3 Nov 2017 13:15:54 +0800
|
|
Subject: [RHEL7.5 PATCH 1/2] Enable raid5 journal function
|
|
|
|
Resolves: rhbz1505611
|
|
|
|
Signed-off-by: Xiao Ni <xni@redhat.com>
|
|
---
|
|
disable-journal.patch | 34 ----------------------------------
|
|
mdadm.spec | 9 +++++----
|
|
2 files changed, 5 insertions(+), 38 deletions(-)
|
|
delete mode 100644 disable-journal.patch
|
|
|
|
diff --git a/disable-journal.patch b/disable-journal.patch
|
|
deleted file mode 100644
|
|
index 7631164..0000000
|
|
--- a/disable-journal.patch
|
|
+++ /dev/null
|
|
@@ -1,34 +0,0 @@
|
|
-diff --git a/ReadMe.c b/ReadMe.c
|
|
-index eb8fb4b..2de30e1 100644
|
|
---- a/ReadMe.c
|
|
-+++ b/ReadMe.c
|
|
-@@ -147,7 +147,9 @@ struct option long_options[] = {
|
|
- {"data-offset",1, 0, DataOffset},
|
|
- {"nodes",1, 0, Nodes}, /* also for --assemble */
|
|
- {"home-cluster",1, 0, ClusterName},
|
|
-+#if 0 /* Disable for RHEL */
|
|
- {"write-journal",1, 0, WriteJournal},
|
|
-+#endif
|
|
- {"consistency-policy", 1, 0, 'k'},
|
|
-
|
|
- /* For assemble */
|
|
-@@ -163,7 +165,9 @@ struct option long_options[] = {
|
|
- /* Management */
|
|
- {"add", 0, 0, Add},
|
|
- {"add-spare", 0, 0, AddSpare},
|
|
-+#if 0 /* Disable for RHEL */
|
|
- {"add-journal", 0, 0, AddJournal},
|
|
-+#endif
|
|
- {"remove", 0, 0, Remove},
|
|
- {"fail", 0, 0, Fail},
|
|
- {"set-faulty",0, 0, Fail},
|
|
-@@ -383,7 +387,9 @@ char Help_create[] =
|
|
- " --name= -N : Textual name for array - max 32 characters\n"
|
|
- " --bitmap-chunk= : bitmap chunksize in Kilobytes.\n"
|
|
- " --delay= -d : bitmap update delay in seconds.\n"
|
|
-+#if 0 /* Disable for RHEL */
|
|
- " --write-journal= : Specify journal device for RAID-4/5/6 array\n"
|
|
-+#endif
|
|
- " --consistency-policy= : Specify the policy that determines how the array\n"
|
|
- " -k : maintains consistency in case of unexpected shutdown.\n"
|
|
- "\n"
|
|
diff --git a/mdadm.spec b/mdadm.spec
|
|
index 580ea81..3e71342 100644
|
|
--- a/mdadm.spec
|
|
+++ b/mdadm.spec
|
|
@@ -1,7 +1,7 @@
|
|
Summary: The mdadm program controls Linux md devices (software RAID arrays)
|
|
Name: mdadm
|
|
Version: 4.0
|
|
-Release: 8%{?dist}
|
|
+Release: 9%{?dist}
|
|
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
|
|
Source1: mdmonitor.init
|
|
Source2: raid-check
|
|
@@ -207,7 +207,6 @@ Patch195: mdadm-3.4-udev-race.patch
|
|
Patch196: mdadm-3.3.2-skip-rules.patch
|
|
Patch197: mdadm-3.3-udev.patch
|
|
Patch198: mdadm-2.5.2-static.patch
|
|
-Patch199: disable-journal.patch
|
|
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
|
|
License: GPLv2+
|
|
Group: System Environment/Base
|
|
@@ -422,13 +421,11 @@ file can be used to help with some common tasks.
|
|
%patch187 -p1 -b .validating
|
|
%patch188 -p1 -b .initial
|
|
|
|
-
|
|
# RHEL customization patches
|
|
%patch195 -p1 -b .race
|
|
%patch196 -p1 -b .rules
|
|
%patch197 -p1 -b .udev
|
|
%patch198 -p1 -b .static
|
|
-%patch199 -p1 -b .journal
|
|
|
|
%build
|
|
make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon
|
|
@@ -490,6 +487,10 @@ rm -rf %{buildroot}
|
|
/etc/libreport/events.d/*
|
|
|
|
%changelog
|
|
+* Fri Nov 03 2017 Xiao Ni <xni@redhat.com> - 4.0-9
|
|
+- Enable raid5 journal function
|
|
+- Resolves rhbz1505611
|
|
+
|
|
* Fri Nov 03 2017 Xiao Ni <xni@redhat.com> - 4.0-8
|
|
- Support for multiple-ppl in mdadm
|
|
- Resolves rhbz#1500638
|
|
--
|
|
2.7.4
|
|
|