diff --git a/SOURCES/disable-journal.patch b/SOURCES/disable-journal.patch new file mode 100644 index 0000000..716773b --- /dev/null +++ b/SOURCES/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.9*/ + {"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.9*/ + {"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.9*/ + " --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/SPECS/mdadm.spec b/SPECS/mdadm.spec index 3ef9175..48cf8d6 100644 --- a/SPECS/mdadm.spec +++ b/SPECS/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 4.1 -Release: 6%{?dist} +Release: 7%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz Source1: mdmonitor.init Source2: raid-check @@ -84,6 +84,7 @@ Patch70: 0070-Manage-imsm-Write-metadata-before-add.patch Patch71: 0071-Assemble-print-error-message-if-mdadm-fails-assembli.patch # RHEL customization patches +Patch194: disable-journal.patch Patch195: mdadm-3.4-udev-race.patch Patch196: mdadm-3.3.2-skip-rules.patch Patch197: mdadm-3.3-udev.patch @@ -186,6 +187,7 @@ file can be used to help with some common tasks. %patch71 -p1 -b .0071 # RHEL customization patches +%patch194 -p1 -b .disable %patch195 -p1 -b .race %patch196 -p1 -b .rules %patch197 -p1 -b .udev @@ -256,6 +258,10 @@ rm -rf %{buildroot} /usr/share/mdadm/mdcheck %changelog +* Mon Sep 21 2020 Xiao Ni - 4.1.7 +- Disable raid5 journal +- Resolves rhbz#1875457 + * Sat May 09 2020 Xiao Ni - 4.1.6 - Update mdadm to latest upstream - Resolves rhbz#1801605