c9d414952b
Update to 4.3 and backport other patches behind 4.3 Resolves: RHEL-30529 Signed-off-by: Xiao Ni <xni@redhat.com>
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From 933bb500b80cca6f4e9237382f7d8ac852978471 Mon Sep 17 00:00:00 2001
|
|
From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
|
Date: Thu, 29 Feb 2024 12:52:17 +0100
|
|
Subject: [PATCH 33/41] Revert "policy.c: Avoid to take spare without defined
|
|
domain by imsm"
|
|
|
|
This reverts commit 3bf9495270d7 ("policy.c: Avoid to take spare without
|
|
defined domain by imsm").
|
|
|
|
IMSM does not require to be special now because it doesn't create disk
|
|
controller domain.
|
|
|
|
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
|
---
|
|
policy.c | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/policy.c b/policy.c
|
|
index 404f9b5d..dfaafdc0 100644
|
|
--- a/policy.c
|
|
+++ b/policy.c
|
|
@@ -759,7 +759,6 @@ int domain_test(struct domainlist *dom, struct dev_policy *pol,
|
|
* 1: has domains, all match
|
|
*/
|
|
int found_any = -1;
|
|
- int has_one_domain = 1;
|
|
struct dev_policy *p;
|
|
|
|
pol = pol_find(pol, pol_domain);
|
|
@@ -769,9 +768,6 @@ int domain_test(struct domainlist *dom, struct dev_policy *pol,
|
|
dom = dom->next;
|
|
if (!dom || strcmp(dom->dom, p->value) != 0)
|
|
return 0;
|
|
- if (has_one_domain && metadata && strcmp(metadata, "imsm") == 0)
|
|
- found_any = -1;
|
|
- has_one_domain = 0;
|
|
}
|
|
return found_any;
|
|
}
|
|
--
|
|
2.40.1
|
|
|