1c8fb911e6
- Update for latest mdadm-4.1+ patches, this is required by jsc#SLE-10078 and jsc#SLE-9348. Mostly the purpose is for latest Intel IMSM raid support. The following patches also include previous patches with new re-ordered prefix numbers. - Makefile: install mdadm_env.sh to /usr/lib/mdadm (bsc#1111960) 0000-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch - Assemble: keep MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flag (jsc#SLE-10078, jsc#SLE-9348) 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch - Document PART-POLICY lines (jsc#SLE-10078, jsc#SLE-9348) 0002-Document-PART-POLICY-lines.patc - policy: support devices with multiple paths. (jsc#SLE-10078, jsc#SLE-9348) 0003-policy-support-devices-with-multiple-paths.patch - mdcheck: add systemd unit files to run mdcheck. (bsc#1115407) 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch - Monitor: add system timer to run --oneshot periodically (bsc#1115407) 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch - imsm: update metadata correctly while raid10 double (jsc#SLE-10078, jsc#SLE-9348) 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch - Assemble: mask FAILFAST and WRITEMOSTLY flags when finding (jsc#SLE-10078, jsc#SLE-9348) 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch - Grow: avoid overflow in compute_backup_blocks() (jsc#SLE-10078, jsc#SLE-9348) 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch - Grow: report correct new chunk size. (jsc#SLE-10078, jsc#SLE-9348) 0009-Grow-report-correct-new-chunk-size.patch OBS-URL: https://build.opensuse.org/request/show/781064 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=181
44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From 486720e0c2418e7e2e0a16221f7c42a308622254 Mon Sep 17 00:00:00 2001
|
|
From: Jes Sorensen <jsorensen@fb.com>
|
|
Date: Tue, 9 Jul 2019 14:49:22 -0400
|
|
Subject: [PATCH] super-intel: Use put_unaligned in split_ull
|
|
Git-commit: 486720e0c2418e7e2e0a16221f7c42a308622254
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
Shut up some gcc9 errors by using put_unaligned() accessors. Not pretty,
|
|
but better than it was.
|
|
|
|
Also correct to the correct swap macros.
|
|
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
super-intel.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/super-intel.c b/super-intel.c
|
|
index 230e164..d7e8a65 100644
|
|
--- a/super-intel.c
|
|
+++ b/super-intel.c
|
|
@@ -1165,12 +1165,12 @@ static int count_memberships(struct dl *dl, struct intel_super *super)
|
|
|
|
static __u32 imsm_min_reserved_sectors(struct intel_super *super);
|
|
|
|
-static int split_ull(unsigned long long n, __u32 *lo, __u32 *hi)
|
|
+static int split_ull(unsigned long long n, void *lo, void *hi)
|
|
{
|
|
if (lo == 0 || hi == 0)
|
|
return 1;
|
|
- *lo = __le32_to_cpu((unsigned)n);
|
|
- *hi = __le32_to_cpu((unsigned)(n >> 32));
|
|
+ __put_unaligned32(__cpu_to_le32((__u32)n), lo);
|
|
+ __put_unaligned32(__cpu_to_le32((n >> 32)), hi);
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
2.25.0
|
|
|