From 834b7260c7184ca5df369e977a27ffb44ac3a615 Mon Sep 17 00:00:00 2001 From: Xiao Ni Date: Mon, 11 Dec 2017 13:47:38 +0800 Subject: [RHEL7.5 PATCH 2/2] Disable raid5 journal function Resolves: rhbz#1518477 Signed-off-by: Xiao Ni --- disable-journal.patch | 32 ++++++++++++++++++++++++++++++++ mdadm.spec | 8 +++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 disable-journal.patch diff --git a/disable-journal.patch b/disable-journal.patch new file mode 100644 index 0000000..1bd67c3 --- /dev/null +++ b/disable-journal.patch @@ -0,0 +1,32 @@ +--- a/ReadMe.c~ 2017-12-11 11:15:10.314176222 +0800 ++++ b/ReadMe.c 2017-12-11 11:16:42.451297334 +0800 +@@ -147,7 +147,9 @@ + {"data-offset",1, 0, DataOffset}, + {"nodes",1, 0, Nodes}, /* also for --assemble */ + {"home-cluster",1, 0, ClusterName}, ++#if 0 /*Disable for rhel7.5*/ + {"write-journal",1, 0, WriteJournal}, ++#endif + {"consistency-policy", 1, 0, 'k'}, + + /* For assemble */ +@@ -163,7 +165,9 @@ + /* Management */ + {"add", 0, 0, Add}, + {"add-spare", 0, 0, AddSpare}, ++#if 0 /*Disable for rhel7.5*/ + {"add-journal", 0, 0, AddJournal}, ++#endif + {"remove", 0, 0, Remove}, + {"fail", 0, 0, Fail}, + {"set-faulty",0, 0, Fail}, +@@ -383,7 +387,9 @@ + " --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 rhel7.5*/ + " --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 3e71342..0b75bb0 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: 9%{?dist} +Release: 10%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz Source1: mdmonitor.init Source2: raid-check @@ -207,6 +207,7 @@ 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 @@ -426,6 +427,7 @@ file can be used to help with some common tasks. %patch196 -p1 -b .rules %patch197 -p1 -b .udev %patch198 -p1 -b .static +%patch199 -p1 -b .disable %build make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon @@ -487,6 +489,10 @@ rm -rf %{buildroot} /etc/libreport/events.d/* %changelog +* Mon Dec 11 2017 Xiao Ni - 4.0-10 +- Disable raid5 journal function +- Resolves rhbz#1518477 + * Fri Nov 03 2017 Xiao Ni - 4.0-9 - Enable raid5 journal function - Resolves rhbz1505611 -- 2.7.4