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
68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
From f2cc4f7d829e1b849e78bdf6c38b7bd6e234c600 Mon Sep 17 00:00:00 2001
|
|
From: Alexey Obitotskiy <aleksey.obitotskiy@intel.com>
|
|
Date: Tue, 9 May 2017 12:25:45 +0200
|
|
Subject: [PATCH] imsm: don't allow disks with different sector size in one
|
|
array
|
|
|
|
As there is no support in IMSM for arrays including disks with different
|
|
sector sizes, don't allow to create such configuration. Also skip the
|
|
disk with unsuitable sector size when looking for spares in the same
|
|
container.
|
|
|
|
Signed-off-by: Alexey Obitotskiy <aleksey.obitotskiy@intel.com>
|
|
Signed-off-by: Tomasz Majchrzak <tomasz.majchrzak@intel.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
---
|
|
super-intel.c | 24 ++++++++++++++++++++++++
|
|
1 file changed, 24 insertions(+)
|
|
|
|
Index: mdadm/super-intel.c
|
|
===================================================================
|
|
--- mdadm.orig/super-intel.c
|
|
+++ mdadm/super-intel.c
|
|
@@ -5487,6 +5487,22 @@ static int init_super_imsm(struct supert
|
|
return 1;
|
|
}
|
|
|
|
+static int drive_validate_sector_size(struct intel_super *super, struct dl *dl)
|
|
+{
|
|
+ unsigned int member_sector_size;
|
|
+
|
|
+ if (dl->fd < 0) {
|
|
+ pr_err("Invalid file descriptor for %s\n", dl->devname);
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ if (!get_dev_sector_size(dl->fd, dl->devname, &member_sector_size))
|
|
+ return 0;
|
|
+ if (member_sector_size != super->sector_size)
|
|
+ return 0;
|
|
+ return 1;
|
|
+}
|
|
+
|
|
#ifndef MDASSEMBLE
|
|
static int add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
|
|
int fd, char *devname)
|
|
@@ -5527,6 +5543,11 @@ static int add_to_super_imsm_volume(stru
|
|
return 1;
|
|
}
|
|
|
|
+ if (!drive_validate_sector_size(super, dl)) {
|
|
+ pr_err("Combining drives of different sector size in one volume is not allowed\n");
|
|
+ return 1;
|
|
+ }
|
|
+
|
|
/* add a pristine spare to the metadata */
|
|
if (dl->index < 0) {
|
|
dl->index = super->anchor->num_disks;
|
|
@@ -8490,6 +8511,9 @@ static struct dl *imsm_add_spare(struct
|
|
if (dl->index == -1 && !activate_new)
|
|
continue;
|
|
|
|
+ if (!drive_validate_sector_size(super, dl))
|
|
+ continue;
|
|
+
|
|
/* Does this unused device have the requisite free space?
|
|
* It needs to be able to cover all member volumes
|
|
*/
|