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
65 lines
2.2 KiB
Diff
65 lines
2.2 KiB
Diff
From 227aeaa872d4898273cf87a4253898823d556c43 Mon Sep 17 00:00:00 2001
|
|
From: Corey Hickey <bugfood-c@fatooh.org>
|
|
Date: Mon, 11 Feb 2019 17:42:27 -0800
|
|
Subject: [PATCH] add missing units to --examine
|
|
Git-commit: 227aeaa872d4898273cf87a4253898823d556c43
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
Within the output of "mdadm --examine", there are three sizes reported
|
|
on adjacent lines. For example:
|
|
|
|
$ sudo mdadm --examine /dev/md3
|
|
[...]
|
|
Avail Dev Size : 17580545024 (8383.06 GiB 9001.24 GB)
|
|
Array Size : 17580417024 (16765.99 GiB 18002.35 GB)
|
|
Used Dev Size : 11720278016 (5588.66 GiB 6000.78 GB)
|
|
[...]
|
|
|
|
This can be confusing, since the first and third line are in 512-byte
|
|
sectors, and the second is in KiB.
|
|
|
|
Add units to avoid ambiguity.
|
|
|
|
(I don't particularly like the "KiB" notation, but it is at least
|
|
unambiguous.)
|
|
|
|
Signed-off-by: Corey Hickey <bugfood-c@fatooh.org>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
super1.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/super1.c b/super1.c
|
|
index 636a286..b85dc20 100644
|
|
--- a/super1.c
|
|
+++ b/super1.c
|
|
@@ -360,7 +360,7 @@ static void examine_super1(struct supertype *st, char *homehost)
|
|
printf(" Raid Level : %s\n", c?c:"-unknown-");
|
|
printf(" Raid Devices : %d\n", __le32_to_cpu(sb->raid_disks));
|
|
printf("\n");
|
|
- printf(" Avail Dev Size : %llu%s\n",
|
|
+ printf(" Avail Dev Size : %llu sectors%s\n",
|
|
(unsigned long long)__le64_to_cpu(sb->data_size),
|
|
human_size(__le64_to_cpu(sb->data_size)<<9));
|
|
if (__le32_to_cpu(sb->level) > 0) {
|
|
@@ -378,11 +378,11 @@ static void examine_super1(struct supertype *st, char *homehost)
|
|
if (ddsks) {
|
|
long long asize = __le64_to_cpu(sb->size);
|
|
asize = (asize << 9) * ddsks / ddsks_denom;
|
|
- printf(" Array Size : %llu%s\n",
|
|
+ printf(" Array Size : %llu KiB%s\n",
|
|
asize >> 10, human_size(asize));
|
|
}
|
|
if (sb->size != sb->data_size)
|
|
- printf(" Used Dev Size : %llu%s\n",
|
|
+ printf(" Used Dev Size : %llu sectors%s\n",
|
|
(unsigned long long)__le64_to_cpu(sb->size),
|
|
human_size(__le64_to_cpu(sb->size)<<9));
|
|
}
|
|
--
|
|
2.25.0
|
|
|