Change the argument to arrays_in_domain so we aren't always rechecking

symlinks when we've already got our domain

Signed-off-by: Doug Ledford <dledford@redhat.com>

2 files changed, 3 insertions, 8 deletions

diff --git a/config.c b/config.c
index 52c0fad..a1eb9dd 100644
--- a/config.c
+++ b/config.c
@@ -1278,16 +1278,11 @@ struct domain_ent *conf_get_domain(char *devname)
  * this information to determine what array we might add our new device
  * to either as a replacement drive or as a hot spare.
  */
-struct mdstat_ent *arrays_in_domain(char *devname)
+struct mdstat_ent *arrays_in_domain(struct domain_ent *domain)
 {
 	struct mdstat_ent *me, *mdstat, *array_list = NULL;
 	struct dev_member *m;
-	struct domain_ent *domain, *de;
-
-	/* make sure name is a kernel internal name, not a path */
-	domain = conf_get_domain(devname);
-	if (!domain)
-		return NULL;
+	struct domain_ent *de;
 
 	mdstat = mdstat_read(0, 0);
 	while (mdstat) {
diff --git a/mdadm.h b/mdadm.h
index 9326d17..e090920 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -884,7 +884,7 @@ extern mddev_ident_t conf_get_ident(char *dev);
 extern mddev_dev_t conf_get_devs(void);
 extern struct domain_ent *conf_get_domain(char *devname);
 extern int conf_get_domain_action(char *devname);
-extern struct mdstat_ent *arrays_in_domain(char *devname);
+extern struct mdstat_ent *arrays_in_domain(struct domain_ent *domain);
 extern int conf_test_dev(char *devname);
 extern int conf_test_metadata(const char *version, int is_homehost);
 extern struct createinfo *conf_get_create_info(void);