X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=util.c;h=2a206448e4e2b07586d4baa7968941ef108afb86;hb=ff044d6ba707c22ab33c508640dd14ab537c1c16;hp=e26aba9128587d21302816323b8b6f7d139d0193;hpb=bc77ed535db05fc4b5b46f20dc4c27893f01610d;p=thirdparty%2Fmdadm.git

diff --git a/util.c b/util.c
index e26aba91..2a206448 100644
--- a/util.c
+++ b/util.c
@@ -1068,6 +1068,7 @@ struct supertype *super_by_fd(int fd, char **subarrayp)
 	char version[20];
 	int i;
 	char *subarray = NULL;
+	int container = NoMdDev;
 
 	sra = sysfs_read(fd, 0, GET_VERSION);
 
@@ -1089,15 +1090,15 @@ struct supertype *super_by_fd(int fd, char **subarrayp)
 	}
 	if (minor == -2 && is_subarray(verstr)) {
 		char *dev = verstr+1;
+
 		subarray = strchr(dev, '/');
-		int devnum;
 		if (subarray)
 			*subarray++ = '\0';
-		devnum = devname2devnum(dev);
 		subarray = strdup(subarray);
+		container = devname2devnum(dev);
 		if (sra)
 			sysfs_free(sra);
-		sra = sysfs_read(-1, devnum, GET_VERSION);
+		sra = sysfs_read(-1, container, GET_VERSION);
 		if (sra && sra->text_version[0])
 			verstr = sra->text_version;
 		else
@@ -1113,8 +1114,11 @@ struct supertype *super_by_fd(int fd, char **subarrayp)
 		st->sb = NULL;
 		if (subarrayp)
 			*subarrayp = subarray;
+		st->container_dev = container;
+		st->devnum = fd2devnum(fd);
 	} else
 		free(subarray);
+
 	return st;
 }
 #endif /* !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO) */
@@ -1622,6 +1626,21 @@ int add_disk(int mdfd, struct supertype *st,
 	return rv;
 }
 
+int remove_disk(int mdfd, struct supertype *st,
+		struct mdinfo *sra, struct mdinfo *info)
+{
+	int rv;
+	/* Remove the disk given by 'info' from the array */
+#ifndef MDASSEMBLE
+	if (st->ss->external)
+		rv = sysfs_set_str(sra, info, "slot", "none");
+	else
+#endif
+		rv = ioctl(mdfd, HOT_REMOVE_DISK, makedev(info->disk.major,
+							  info->disk.minor));
+	return rv;
+}
+
 int set_array_info(int mdfd, struct supertype *st, struct mdinfo *info)
 {
 	/* Initialise kernel's knowledge of array.