850cf2857b
- SLE15 continues to use mdadm-4.0, synchronize mdadm package from
SLE12-SP3 to SLE15, re-order all patches.
- Rename the following patches, they are deleted and re-add in next
part of patches
0001-Generic-support-for-consistency-policy-and-PPL.patch
0002-Detail-show-consistency-policy.patch
0002-The-mdcheck-script-now-adds-messages-to-the-system.patch
0003-imsm-PPL-support.patch
0004-super1-PPL-support.patch
0005-Add-ppl-and-no-ppl-options-for-update.patch
0006-Grow-support-consistency-policy-change.patch
0007-udev-md-raid-assembly.rules-Skip-non-ready-devices.patch
0008-Retry-HOT_REMOVE_DISK-a-few-times.patch
0009-Introduce-sys_hot_remove_disk.patch
0010-Add-force-flag-to-hot_remove_disk.patch
0011-Detail-handle-non-existent-arrays-better.patch
- Synchronize patches from mdadm of SLE12-SP3, the above renamed
patches are re-add here,
0001-Makefile-Fix-date-to-be-output-in-ISO-format.patch
0002-imsm-fix-missing-error-message-during-migration.patch
0003-Fix-oddity-where-mdadm-did-not-recognise-a-relative-.patch
0004-mdadm-check-the-nodes-when-operate-clustered-array.patch
0005-examine-tidy-up-some-code.patch
0006-mdadm-add-man-page-for-symlinks.patch
0007-mdadm-add-checking-clustered-bitmap-in-assemble-mode.patch
0008-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
0009-mdadm-Specify-enough-length-when-write-to-buffer.patch
0010-mdadm-it-doesn-t-make-sense-to-set-bitmap-twice.patch
0011-mdadm-Monitor-Fix-NULL-pointer-dereference-when-stat.patch
0012-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
OBS-URL: https://build.opensuse.org/request/show/517978
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=150
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 84918897ee8bb450ea09f7c95b9da44df8e925e4 Mon Sep 17 00:00:00 2001
|
|
From: Maksymilian Kunt <maksymilian.kunt@intel.com>
|
|
Date: Tue, 9 May 2017 14:03:27 +0200
|
|
Subject: [PATCH] IMSM: Correct --examine output for 4k disks
|
|
|
|
"Array Size" and "Per Dev Size" are incorrect for disks with sector size
|
|
different than 512B.
|
|
|
|
Calculate "Array Size" and "Per Dev Size" based on sector size. Additionally
|
|
print "Sector Size".
|
|
|
|
Signed-off-by: Maksymilian Kunt <maksymilian.kunt@intel.com>
|
|
Signed-off-by: Mariusz Dabrowski <mariusz.dabrowski@intel.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
---
|
|
super-intel.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/super-intel.c b/super-intel.c
|
|
index ba6f810..8ca80d3 100644
|
|
--- a/super-intel.c
|
|
+++ b/super-intel.c
|
|
@@ -1482,13 +1482,16 @@ static void print_imsm_dev(struct intel_super *super,
|
|
ord & IMSM_ORD_REBUILD ? " (out-of-sync)" : "");
|
|
} else
|
|
printf(" This Slot : ?\n");
|
|
+ printf(" Sector Size : %u\n", super->sector_size);
|
|
sz = __le32_to_cpu(dev->size_high);
|
|
sz <<= 32;
|
|
sz += __le32_to_cpu(dev->size_low);
|
|
- printf(" Array Size : %llu%s\n", (unsigned long long)sz,
|
|
+ printf(" Array Size : %llu%s\n",
|
|
+ (unsigned long long)sz * 512 / super->sector_size,
|
|
human_size(sz * 512));
|
|
sz = blocks_per_member(map);
|
|
- printf(" Per Dev Size : %llu%s\n", (unsigned long long)sz,
|
|
+ printf(" Per Dev Size : %llu%s\n",
|
|
+ (unsigned long long)sz * 512 / super->sector_size,
|
|
human_size(sz * 512));
|
|
printf(" Sector Offset : %llu\n",
|
|
pba_of_lba0(map));
|
|
--
|
|
2.12.0
|
|
|