76 lines
2.5 KiB
Diff
76 lines
2.5 KiB
Diff
|
From e492d2ac143e7f02d6c262130d42a4422e8295d5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
||
|
|
Date: Thu, 29 Feb 2024 12:52:16 +0100
|
||
|
|
Subject: [PATCH 32/41] mdadm: drop get_disk_controller_domain()
|
||
|
|
|
||
|
|
This function is unused now. Drop it.
|
||
|
|
Controller for IMSM is a device policy and is separated from user defined
|
||
|
|
domains.
|
||
|
|
|
||
|
|
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
||
|
|
---
|
||
|
|
mdadm.h | 15 ---------------
|
||
|
|
policy.c | 13 -------------
|
||
|
|
2 files changed, 28 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/mdadm.h b/mdadm.h
|
||
|
|
index cfa11391..3fedca48 100644
|
||
|
|
--- a/mdadm.h
|
||
|
|
+++ b/mdadm.h
|
||
|
|
@@ -1286,21 +1286,6 @@ extern struct superswitch {
|
||
|
|
*/
|
||
|
|
struct mdinfo *(*activate_spare)(struct active_array *a,
|
||
|
|
struct metadata_update **updates);
|
||
|
|
- /*
|
||
|
|
- * Return statically allocated string that represents metadata specific
|
||
|
|
- * controller domain of the disk. The domain is used in disk domain
|
||
|
|
- * matching functions. Disks belong to the same domain if the they have
|
||
|
|
- * the same domain from mdadm.conf and belong the same metadata domain.
|
||
|
|
- * Returning NULL or not providing this handler means that metadata
|
||
|
|
- * does not distinguish the differences between disks that belong to
|
||
|
|
- * different controllers. They are in the domain specified by
|
||
|
|
- * configuration file (mdadm.conf).
|
||
|
|
- * In case when the metadata has the notion of domains based on disk
|
||
|
|
- * it shall return NULL for disks that do not belong to the controller
|
||
|
|
- * the supported domains. Such disks will form another domain and won't
|
||
|
|
- * be mixed with supported ones.
|
||
|
|
- */
|
||
|
|
- const char *(*get_disk_controller_domain)(const char *path);
|
||
|
|
|
||
|
|
/* for external backup area */
|
||
|
|
int (*recover_backup)(struct supertype *st, struct mdinfo *info);
|
||
|
|
diff --git a/policy.c b/policy.c
|
||
|
|
index 4b85f62d..404f9b5d 100644
|
||
|
|
--- a/policy.c
|
||
|
|
+++ b/policy.c
|
||
|
|
@@ -365,7 +365,6 @@ struct dev_policy *path_policy(char **paths, char *type)
|
||
|
|
{
|
||
|
|
struct pol_rule *rules;
|
||
|
|
struct dev_policy *pol = NULL;
|
||
|
|
- int i;
|
||
|
|
|
||
|
|
rules = config_rules;
|
||
|
|
|
||
|
|
@@ -380,18 +379,6 @@ struct dev_policy *path_policy(char **paths, char *type)
|
||
|
|
rules = rules->next;
|
||
|
|
}
|
||
|
|
|
||
|
|
- /* Now add any metadata-specific internal knowledge
|
||
|
|
- * about this path
|
||
|
|
- */
|
||
|
|
- for (i=0; paths && paths[0] && superlist[i]; i++)
|
||
|
|
- if (superlist[i]->get_disk_controller_domain) {
|
||
|
|
- const char *d =
|
||
|
|
- superlist[i]->get_disk_controller_domain(
|
||
|
|
- paths[0]);
|
||
|
|
- if (d)
|
||
|
|
- pol_new(&pol, pol_domain, d, superlist[i]->name);
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
pol_sort(&pol);
|
||
|
|
pol_dedup(pol);
|
||
|
|
return pol;
|
||
|
|
--
|
||
|
|
2.40.1
|
||
|
|
|