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
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From 2c2d9c48d2daf0d78d20494c3779c0f6dc4bfa75 Mon Sep 17 00:00:00 2001
|
|
From: Nigel Croxon <ncroxon@redhat.com>
|
|
Date: Tue, 24 Sep 2019 11:39:24 -0400
|
|
Subject: [PATCH] mdadm: force a uuid swap on big endian
|
|
Git-commit: 2c2d9c48d2daf0d78d20494c3779c0f6dc4bfa75
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
The code path for metadata 0.90 calls a common routine
|
|
fname_from_uuid that uses metadata 1.2. The code expects member
|
|
swapuuid to be setup and usable. But it is only setup when using
|
|
metadata 1.2. Since the metadata 0.90 did not create swapuuid
|
|
and set it. The test (st->ss == &super1) ? 1 : st->ss->swapuuid
|
|
fails. The swapuuid is set at compile time based on byte order.
|
|
Any call based on metadata 0.90 and on big endian processors,
|
|
the --export uuid will be incorrect.
|
|
|
|
Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
util.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/util.c b/util.c
|
|
index c26cf5f..64dd409 100644
|
|
--- a/util.c
|
|
+++ b/util.c
|
|
@@ -685,8 +685,12 @@ char *fname_from_uuid(struct supertype *st, struct mdinfo *info,
|
|
// work, but can't have it set if we want this printout to match
|
|
// all the other uuid printouts in super1.c, so we force swapuuid
|
|
// to 1 to make our printout match the rest of super1
|
|
+#if __BYTE_ORDER == BIG_ENDIAN
|
|
+ return __fname_from_uuid(info->uuid, 1, buf, sep);
|
|
+#else
|
|
return __fname_from_uuid(info->uuid, (st->ss == &super1) ? 1 :
|
|
st->ss->swapuuid, buf, sep);
|
|
+#endif
|
|
}
|
|
|
|
int check_ext2(int fd, char *name)
|
|
--
|
|
2.25.0
|
|
|