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
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From 1a1ced1e2e64a6b4b349a3fb559f6b39e4cf7103 Mon Sep 17 00:00:00 2001
|
|
From: Krzysztof Smolinski <krzysztof.smolinski@intel.com>
|
|
Date: Fri, 8 Nov 2019 11:59:11 +0100
|
|
Subject: [PATCH] imsm: allow to specify second volume size
|
|
Git-commit: 1a1ced1e2e64a6b4b349a3fb559f6b39e4cf7103
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
Removed checks which limited second volume size only to max value (the
|
|
largest size that fits on all current drives). It is now permitted
|
|
to create second volume with size lower then maximum possible.
|
|
|
|
Signed-off-by: Krzysztof Smolinski <krzysztof.smolinski@intel.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
super-intel.c | 14 ++++----------
|
|
1 file changed, 4 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/super-intel.c b/super-intel.c
|
|
index e02bbd7..713058c 100644
|
|
--- a/super-intel.c
|
|
+++ b/super-intel.c
|
|
@@ -7298,11 +7298,8 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
|
|
|
|
maxsize = merge_extents(super, i);
|
|
|
|
- if (!check_env("IMSM_NO_PLATFORM") &&
|
|
- mpb->num_raid_devs > 0 && size && size != maxsize) {
|
|
- pr_err("attempting to create a second volume with size less then remaining space. Aborting...\n");
|
|
- return 0;
|
|
- }
|
|
+ if (mpb->num_raid_devs > 0 && size && size != maxsize)
|
|
+ pr_err("attempting to create a second volume with size less then remaining space.\n");
|
|
|
|
if (maxsize < size || maxsize == 0) {
|
|
if (verbose) {
|
|
@@ -7393,11 +7390,8 @@ static int imsm_get_free_size(struct supertype *st, int raiddisks,
|
|
}
|
|
maxsize = size;
|
|
}
|
|
- if (!check_env("IMSM_NO_PLATFORM") &&
|
|
- mpb->num_raid_devs > 0 && size && size != maxsize) {
|
|
- pr_err("attempting to create a second volume with size less then remaining space. Aborting...\n");
|
|
- return 0;
|
|
- }
|
|
+ if (mpb->num_raid_devs > 0 && size && size != maxsize)
|
|
+ pr_err("attempting to create a second volume with size less then remaining space.\n");
|
|
cnt = 0;
|
|
for (dl = super->disks; dl; dl = dl->next)
|
|
if (dl->e)
|
|
--
|
|
2.25.0
|
|
|