Fix raid0 layout display problem

Resolves: RHEL-8372

Signed-off-by: Xiao Ni <xni@redhat.com>
This commit is contained in:
Xiao Ni 2023-11-10 19:39:51 +08:00
parent 53a00780e5
commit 46c8631620
2 changed files with 18 additions and 1 deletions

View File

@ -2,7 +2,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm Name: mdadm
Version: 4.2 Version: 4.2
# extraversion is used to define rhel internal version # extraversion is used to define rhel internal version
%define extraversion 12 %define extraversion 13
Release: %{extraversion}%{?dist} Release: %{extraversion}%{?dist}
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}%{?subversion:-%{subversion}}.tar.xz Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}%{?subversion:-%{subversion}}.tar.xz
Source1: mdmonitor.init Source1: mdmonitor.init
@ -183,6 +183,7 @@ Patch164: 0165-Fix-assembling-RAID-volume-by-using-incremental.patch
# RHEL customization patches # RHEL customization patches
Patch200: mdadm-udev.patch Patch200: mdadm-udev.patch
Patch201: mdadm-2.5.2-static.patch Patch201: mdadm-2.5.2-static.patch
Patch202: raid0-layout.patch
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
License: GPLv2+ License: GPLv2+
@ -272,6 +273,10 @@ rm -rf %{buildroot}
/usr/share/mdadm/mdcheck /usr/share/mdadm/mdcheck
%changelog %changelog
* Fri Nov 10 2023 Xiao Ni <xni@redhat.com> - 4.2-13
- Fix raid0 layout display problem
- Resolves RHEL-8372
* Tue Nov 7 2023 Xiao Ni <xni@redhat.com> - 4.2-12 * Tue Nov 7 2023 Xiao Ni <xni@redhat.com> - 4.2-12
- Fix rpminspect check error from gating test - Fix rpminspect check error from gating test
- Resolves RHEL-15388 - Resolves RHEL-15388

12
raid0-layout.patch Normal file
View File

@ -0,0 +1,12 @@
--- mdadm/super1-orig.c 2023-11-10 19:27:25.262178162 +0800
+++ mdadm/super1.c 2023-11-10 19:28:25.991441827 +0800
@@ -1988,8 +1988,7 @@
long bm_offset;
bool raid0_need_layout = false;
- /* Since linux kernel v5.4, raid0 always has a layout */
- if (has_raid0_layout(sb) && get_linux_version() >= 5004000)
+ if (has_raid0_layout(sb))
raid0_need_layout = true;
for (di = st->info; di; di = di->next) {