You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
80 lines
2.4 KiB
80 lines
2.4 KiB
1 month ago
|
From 46f19270265fe54cda1c728cb156b755273b4ab6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
||
|
|
Date: Thu, 23 May 2024 12:06:36 +0200
|
||
|
|
Subject: [PATCH 100/157] imsm: fix first volume autolayout with
|
||
|
|
IMSM_NO_PLATFORM
|
||
|
|
|
||
|
|
Autolayout_imsm() is not executed if IMSM_NO_PLATFORM=1 is set.
|
||
|
|
This causes that first volume cannot be created. Disk for new volume are
|
||
|
|
never configured.
|
||
|
|
|
||
|
|
Fix it by making autolayout_imsm() independent from super->orom because
|
||
|
|
NULL there means that IMSM_NO_PLATFORM=1 is set. There are not platform
|
||
|
|
restrictions to create volume, we just analyze drives. It is safe.
|
||
|
|
|
||
|
|
Fixes: 6d4d9ab295de ("imsm: use same slot across container")
|
||
|
|
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
||
|
|
---
|
||
|
|
super-intel.c | 18 +++++++++---------
|
||
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/super-intel.c b/super-intel.c
|
||
|
|
index 0287a618..29652196 100644
|
||
|
|
--- a/super-intel.c
|
||
|
|
+++ b/super-intel.c
|
||
|
|
@@ -7706,9 +7706,11 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout,
|
||
|
|
char *dev, unsigned long long *freesize,
|
||
|
|
int consistency_policy, int verbose)
|
||
|
|
{
|
||
|
|
- int fd, cfd;
|
||
|
|
+ struct intel_super *super = st->sb;
|
||
|
|
struct mdinfo *sra;
|
||
|
|
int is_member = 0;
|
||
|
|
+ imsm_status_t rv;
|
||
|
|
+ int fd, cfd;
|
||
|
|
|
||
|
|
/* load capability
|
||
|
|
* if given unused devices create a container
|
||
|
|
@@ -7733,11 +7735,10 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout,
|
||
|
|
}
|
||
|
|
|
||
|
|
if (!dev) {
|
||
|
|
- struct intel_super *super = st->sb;
|
||
|
|
-
|
||
|
|
/*
|
||
|
|
* Autolayout mode, st->sb must be set.
|
||
|
|
*/
|
||
|
|
+
|
||
|
|
if (!super) {
|
||
|
|
pr_vrb("superblock must be set for autolayout, aborting\n");
|
||
|
|
return 0;
|
||
|
|
@@ -7749,20 +7750,19 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout,
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
if (super->orom && freesize) {
|
||
|
|
- imsm_status_t rv;
|
||
|
|
- int count = count_volumes(super->hba, super->orom->dpa,
|
||
|
|
- verbose);
|
||
|
|
+ int count = count_volumes(super->hba, super->orom->dpa, verbose);
|
||
|
|
+
|
||
|
|
if (super->orom->vphba <= count) {
|
||
|
|
pr_vrb("platform does not support more than %d raid volumes.\n",
|
||
|
|
super->orom->vphba);
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
+ }
|
||
|
|
|
||
|
|
- rv = autolayout_imsm(super, raiddisks, size, *chunk,
|
||
|
|
- freesize);
|
||
|
|
+ rv = autolayout_imsm(super, raiddisks, size, *chunk, freesize);
|
||
|
|
if (rv != IMSM_STATUS_OK)
|
||
|
|
return 0;
|
||
|
|
- }
|
||
|
|
+
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
if (st->sb) {
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|