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.5 KiB
Diff
44 lines
1.5 KiB
Diff
From a4f7290c20c2ff78328c9db0b18029165cfb05b2 Mon Sep 17 00:00:00 2001
|
|
From: Jes Sorensen <jsorensen@fb.com>
|
|
Date: Tue, 9 Jul 2019 13:26:08 -0400
|
|
Subject: [PATCH] super-intel: Fix issue with abs() being irrelevant
|
|
Git-commit: a4f7290c20c2ff78328c9db0b18029165cfb05b2
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
gcc9 complains about subtracting unsigned from unsigned and code
|
|
assuming the result can be negative.
|
|
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
super-intel.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/super-intel.c b/super-intel.c
|
|
index 4fd5e84..230e164 100644
|
|
--- a/super-intel.c
|
|
+++ b/super-intel.c
|
|
@@ -2875,7 +2875,7 @@ static unsigned long long calc_component_size(struct imsm_map *map,
|
|
{
|
|
unsigned long long component_size;
|
|
unsigned long long dev_size = imsm_dev_size(dev);
|
|
- unsigned long long calc_dev_size = 0;
|
|
+ long long calc_dev_size = 0;
|
|
unsigned int member_disks = imsm_num_data_members(map);
|
|
|
|
if (member_disks == 0)
|
|
@@ -2889,7 +2889,7 @@ static unsigned long long calc_component_size(struct imsm_map *map,
|
|
* 2048 blocks per each device. If the difference is higher it means
|
|
* that array size was expanded and num_data_stripes was not updated.
|
|
*/
|
|
- if ((unsigned int)abs(calc_dev_size - dev_size) >
|
|
+ if (llabs(calc_dev_size - (long long)dev_size) >
|
|
(1 << SECT_PER_MB_SHIFT) * member_disks) {
|
|
component_size = dev_size / member_disks;
|
|
dprintf("Invalid num_data_stripes in metadata; expected=%llu, found=%llu\n",
|
|
--
|
|
2.25.0
|
|
|