Factor out add-disk code

The variety of approaches to 'add_disk' are factored out into
a separate function, and Incremental mode benefits by being
closer to supporting the assembly of containers.

Also remove the adding-to-array-data-structure out of sysfs_add_disk
and into add_disk.

And add some tests for --incremental mode to make sure we don't break it.

Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 21 insertions, 0 deletions

diff --git a/util.c b/util.c
index 181a0a3c..7469fca4 100644
--- a/util.c
+++ b/util.c
@@ -999,6 +999,27 @@ int open_container(int fd)
 	return -1;
 }
 
+int add_disk(int mdfd, struct supertype *st,
+	     struct mdinfo *sra, struct mdinfo *info)
+{
+	/* Add a device to an array, in one of 2 ways. */
+	int rv;
+#ifndef MDASSEMBLE
+	if (st->ss->external) {
+		rv = sysfs_add_disk(sra, info);
+		if (! rv) {
+			struct mdinfo *sd2;
+			sd2 = malloc(sizeof(*sd2));
+			*sd2 = *info;
+			sd2->next = sra->devs;
+			sra->devs = sd2;
+		}
+	} else
+#endif
+		rv = ioctl(mdfd, ADD_NEW_DISK, &info->disk);
+	return rv;
+}
+
 char *devnum2devname(int num)
 {
 	char name[100];