X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Manage.c;h=6f0a6a203f1d28beb4c493d72f055a5494cebebe;hp=4cf40e10d04ae56cc697339d275f28e24baab115;hb=d23534e4646313a67296b295666d165a87bb2c92;hpb=1bf4e2d962d0d7937bb24799aaa636edc6497fa4

diff --git a/Manage.c b/Manage.c
index 4cf40e10..6f0a6a20 100644
--- a/Manage.c
+++ b/Manage.c
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2001-2002 Neil Brown <neilb@cse.unsw.edu.au>
+ * Copyright (C) 2001-2009 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -19,17 +19,13 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *    Author: Neil Brown
- *    Email: <neilb@cse.unsw.edu.au>
- *    Paper: Neil Brown
- *           School of Computer Science and Engineering
- *           The University of New South Wales
- *           Sydney, 2052
- *           Australia
+ *    Email: <neilb@suse.de>
  */
 
 #include "mdadm.h"
 #include "md_u.h"
 #include "md_p.h"
+#include <ctype.h>
 
 #define REGISTER_DEV 		_IO (MD_MAJOR, 1)
 #define START_MD     		_IO (MD_MAJOR, 2)
@@ -45,17 +41,63 @@ int Manage_ro(char *devname, int fd, int readonly)
 	 *
 	 */
 	mdu_array_info_t array;
-	
+#ifndef MDASSEMBLE
+	struct mdinfo *mdi;
+#endif
+
 	if (md_get_version(fd) < 9000) {
 		fprintf(stderr, Name ": need md driver version 0.90.0 or later\n");
 		return 1;
 	}
+#ifndef MDASSEMBLE
+	/* If this is an externally-manage array, we need to modify the
+	 * metadata_version so that mdmon doesn't undo our change.
+	 */
+	mdi = sysfs_read(fd, -1, GET_LEVEL|GET_VERSION);
+	if (mdi &&
+	    mdi->array.major_version == -1 &&
+	    mdi->array.level > 0 &&
+	    is_subarray(mdi->text_version)) {
+		char vers[64];
+		strcpy(vers, "external:");
+		strcat(vers, mdi->text_version);
+		if (readonly > 0) {
+			int rv;
+			/* We set readonly ourselves. */
+			vers[9] = '-';
+			sysfs_set_str(mdi, NULL, "metadata_version", vers);
+
+			close(fd);
+			rv = sysfs_set_str(mdi, NULL, "array_state", "readonly");
+
+			if (rv < 0) {
+				fprintf(stderr, Name ": failed to set readonly for %s: %s\n",
+					devname, strerror(errno));
+
+				vers[9] = mdi->text_version[0];
+				sysfs_set_str(mdi, NULL, "metadata_version", vers);
+				return 1;
+			}
+		} else {
+			char *cp;
+			/* We cannot set read/write - must signal mdmon */
+			vers[9] = '/';
+			sysfs_set_str(mdi, NULL, "metadata_version", vers);
+
+			cp = strchr(vers+10, '/');
+			if (*cp)
+				*cp = 0;
+			ping_monitor(vers+10);
+		}
+		return 0;
+	}
+#endif
 	if (ioctl(fd, GET_ARRAY_INFO, &array)) {
 		fprintf(stderr, Name ": %s does not appear to be active.\n",
 			devname);
 		return 1;
 	}
-	
+
 	if (readonly>0) {
 		if (ioctl(fd, STOP_ARRAY_RO, NULL)) {
 			fprintf(stderr, Name ": failed to set readonly for %s: %s\n",
@@ -69,24 +111,80 @@ int Manage_ro(char *devname, int fd, int readonly)
 			return 1;
 		}
 	}
-	return 0;			
+	return 0;
 }
 
+#ifndef MDASSEMBLE
+
+static void remove_devices(int devnum, char *path)
+{
+	/* Remove all 'standard' devices for 'devnum', including
+	 * partitions.  Also remove names at 'path' - possibly with
+	 * partition suffixes - which link to those names.
+	 */
+	char base[40];
+	char *path2;
+	char link[1024];
+	int n;
+	int part;
+	char *be;
+	char *pe;
+
+	if (devnum >= 0)
+		sprintf(base, "/dev/md%d", devnum);
+	else
+		sprintf(base, "/dev/md_d%d", -1-devnum);
+	be = base + strlen(base);
+	if (path) {
+		path2 = malloc(strlen(path)+20);
+		strcpy(path2, path);
+		pe = path2 + strlen(path2);
+	} else
+		path2 = path = NULL;
+	
+	for (part = 0; part < 16; part++) {
+		if (part) {
+			sprintf(be, "p%d", part);
+			if (path) {
+				if (isdigit(pe[-1]))
+					sprintf(pe, "p%d", part);
+				else
+					sprintf(pe, "%d", part);
+			}
+		}
+		/* FIXME test if really is md device ?? */
+		unlink(base);
+		if (path) {
+			n = readlink(path2, link, sizeof(link));
+			if (n && strlen(base) == n &&
+			    strncmp(link, base, n) == 0)
+				unlink(path2);
+		}
+	}
+	free(path2);
+}
+	
+
 int Manage_runstop(char *devname, int fd, int runstop, int quiet)
 {
 	/* Run or stop the array. array must already be configured
 	 * required >= 0.90.0
+	 * Only print failure messages if quiet == 0;
+	 * quiet > 0 means really be quiet
+	 * quiet < 0 means we will try again if it fails.
 	 */
 	mdu_param_t param; /* unused */
 
 	if (runstop == -1 && md_get_version(fd) < 9000) {
 		if (ioctl(fd, STOP_MD, 0)) {
-			if (!quiet) fprintf(stderr, Name ": stopping device %s failed: %s\n",
-					    devname, strerror(errno));
+			if (quiet == 0) fprintf(stderr,
+						Name ": stopping device %s "
+						"failed: %s\n",
+						devname, strerror(errno));
 			return 1;
 		}
 	}
-	
+
 	if (md_get_version(fd) < 9000) {
 		fprintf(stderr, Name ": need md driver version 0.90.0 or later\n");
 		return 1;
@@ -104,13 +202,86 @@ int Manage_runstop(char *devname, int fd, int runstop, int quiet)
 				devname, strerror(errno));
 			return 1;
 		}
+		if (quiet <= 0)
+			fprintf(stderr, Name ": started %s\n", devname);
 	} else if (runstop < 0){
-		if (ioctl(fd, STOP_ARRAY, NULL)) {
-			if (!quiet)
-				fprintf(stderr, Name ": fail to stop array %s: %s\n",
+		struct map_ent *map = NULL;
+		struct stat stb;
+		struct mdinfo *mdi;
+		int devnum;
+		/* If this is an mdmon managed array, just write 'inactive'
+		 * to the array state and let mdmon clear up.
+		 */
+		devnum = fd2devnum(fd);
+		mdi = sysfs_read(fd, -1, GET_LEVEL|GET_VERSION);
+		if (mdi &&
+		    mdi->array.level > 0 &&
+		    is_subarray(mdi->text_version)) {
+			/* This is mdmon managed. */
+			close(fd);
+			if (sysfs_set_str(mdi, NULL,
+					  "array_state", "inactive") < 0) {
+				if (quiet == 0)
+					fprintf(stderr, Name
+						": failed to stop array %s: %s\n",
+						devname, strerror(errno));
+				return 1;
+			}
+
+			/* Give monitor a chance to act */
+			ping_monitor(mdi->text_version);
+
+			fd = open(devname, O_RDONLY);
+		} else if (mdi &&
+			   mdi->array.major_version == -1 &&
+			   mdi->array.minor_version == -2 &&
+			   !is_subarray(mdi->text_version)) {
+			/* container, possibly mdmon-managed.
+			 * Make sure mdmon isn't opening it, which
+			 * would interfere with the 'stop'
+			 */
+			ping_monitor(mdi->sys_name);
+		}
+
+		if (fd >= 0 && ioctl(fd, STOP_ARRAY, NULL)) {
+			if (quiet == 0) {
+				fprintf(stderr, Name
+					": failed to stop array %s: %s\n",
 					devname, strerror(errno));
+				if (errno == EBUSY)
+					fprintf(stderr, "Perhaps a running "
+						"process, mounted filesystem "
+						"or active volume group?\n");
+			}
+			if (mdi)
+				sysfs_free(mdi);
 			return 1;
 		}
+		/* prior to 2.6.28, KOBJ_CHANGE was not sent when an md array
+		 * was stopped, so We'll do it here just to be sure.  Drop any
+		 * partitions as well...
+		 */
+		if (fd >= 0)
+			ioctl(fd, BLKRRPART, 0);
+		if (mdi)
+			sysfs_uevent(mdi, "change");
+
+		
+		if (devnum != NoMdDev &&
+		    (stat("/dev/.udev", &stb) != 0 ||
+		     check_env("MDADM_NO_UDEV"))) {
+			struct map_ent *mp = map_by_devnum(&map, devnum);
+			remove_devices(devnum, mp ? mp->path : NULL);
+		}
+
+
+		if (quiet <= 0)
+			fprintf(stderr, Name ": stopped %s\n", devname);
+		if (devnum != NoMdDev) {
+			map_delete(&map, devnum);
+			map_write(map);
+			map_free(map);
+		}
 	}
 	return 0;
 }
@@ -135,24 +306,6 @@ int Manage_resize(char *devname, int fd, long long size, int raid_disks)
 	return 0;
 }
 
-int Manage_reconfig(char *devname, int fd, int layout)
-{
-	mdu_array_info_t info;
-	if (ioctl(fd, GET_ARRAY_INFO, &info) != 0) {
-		fprintf(stderr, Name ": Cannot get array information for %s: %s\n",
-			devname, strerror(errno));
-		return 1;
-	}
-	info.layout = layout;
-	printf("layout set to %d\n", info.layout);
-	if (ioctl(fd, SET_ARRAY_INFO, &info) != 0) {
-		fprintf(stderr, Name ": Cannot set layout for %s: %s\n",
-			devname, strerror(errno));
-		return 1;
-	}
-	return 0;
-}
-
 int Manage_subdevs(char *devname, int fd,
 		   mddev_dev_t devlist, int verbose)
 {
@@ -162,35 +315,130 @@ int Manage_subdevs(char *devname, int fd,
 	 *	   try HOT_ADD_DISK
 	 *         If that fails EINVAL, try ADD_NEW_DISK
 	 *  'r' - remove the device HOT_REMOVE_DISK
+	 *        device can be 'faulty' or 'detached' in which case all
+	 *	  matching devices are removed.
 	 *  'f' - set the device faulty SET_DISK_FAULTY
+	 *        device can be 'detached' in which case any device that
+	 *	  is inaccessible will be marked faulty.
 	 */
 	mdu_array_info_t array;
 	mdu_disk_info_t disc;
-	mddev_dev_t dv;
+	unsigned long long array_size;
+	mddev_dev_t dv, next = NULL;
 	struct stat stb;
-	int j;
+	int j, jnext = 0;
 	int tfd;
-	struct supertype *st;
-	void *dsuper = NULL;
-	void *osuper = NULL; /* original super */
+	struct supertype *st, *tst;
 	int duuid[4];
 	int ouuid[4];
+	int lfd = -1;
 
 	if (ioctl(fd, GET_ARRAY_INFO, &array)) {
 		fprintf(stderr, Name ": cannot get array info for %s\n",
 			devname);
 		return 1;
 	}
-	for (dv = devlist ; dv; dv=dv->next) {
-		if (stat(dv->devname, &stb)) {
-			fprintf(stderr, Name ": cannot find %s: %s\n",
-				dv->devname, strerror(errno));
-			return 1;
-		}
-		if ((stb.st_mode & S_IFMT) != S_IFBLK) {
-			fprintf(stderr, Name ": %s is not a block device.\n",
-				dv->devname);
-			return 1;
+
+	/* array.size is only 32 bit and may be truncated.
+	 * So read from sysfs if possible, and record number of sectors
+	 */
+
+	array_size = get_component_size(fd);
+	if (array_size <= 0)
+		array_size = array.size * 2;
+
+	tst = super_by_fd(fd);
+	if (!tst) {
+		fprintf(stderr, Name ": unsupport array - version %d.%d\n",
+			array.major_version, array.minor_version);
+		return 1;
+	}
+
+	for (dv = devlist, j=0 ; dv; dv = next, j = jnext) {
+		unsigned long long ldsize;
+		char dvname[20];
+		char *dnprintable = dv->devname;
+		int err;
+
+		next = dv->next;
+		jnext = 0;
+
+		if (strcmp(dv->devname, "failed")==0 ||
+		    strcmp(dv->devname, "faulty")==0) {
+			if (dv->disposition != 'r') {
+				fprintf(stderr, Name ": %s only meaningful "
+					"with -r, not -%c\n",
+					dv->devname, dv->disposition);
+				return 1;
+			}
+			for (; j < array.raid_disks + array.nr_disks ; j++) {
+				disc.number = j;
+				if (ioctl(fd, GET_DISK_INFO, &disc))
+					continue;
+				if (disc.major == 0 && disc.minor == 0)
+					continue;
+				if ((disc.state & 1) == 0) /* faulty */
+					continue;
+				stb.st_rdev = makedev(disc.major, disc.minor);
+				next = dv;
+				jnext = j+1;
+				sprintf(dvname,"%d:%d", disc.major, disc.minor);
+				dnprintable = dvname;
+				break;
+			}
+			if (jnext == 0)
+				continue;
+		} else if (strcmp(dv->devname, "detached") == 0) {
+			if (dv->disposition != 'r' && dv->disposition != 'f') {
+				fprintf(stderr, Name ": %s only meaningful "
+					"with -r of -f, not -%c\n",
+					dv->devname, dv->disposition);
+				return 1;
+			}
+			for (; j < array.raid_disks + array.nr_disks; j++) {
+				int sfd;
+				disc.number = j;
+				if (ioctl(fd, GET_DISK_INFO, &disc))
+					continue;
+				if (disc.major == 0 && disc.minor == 0)
+					continue;
+				sprintf(dvname,"%d:%d", disc.major, disc.minor);
+				sfd = dev_open(dvname, O_RDONLY);
+				if (sfd >= 0) {
+					close(sfd);
+					continue;
+				}
+				if (dv->disposition == 'f' &&
+				    (disc.state & 1) == 1) /* already faulty */
+					continue;
+				if (errno != ENXIO)
+					continue;
+				stb.st_rdev = makedev(disc.major, disc.minor);
+				next = dv;
+				jnext = j+1;
+				dnprintable = dvname;
+				break;
+			}
+			if (jnext == 0)
+				continue;
+		} else {
+			j = 0;
+
+			tfd = dev_open(dv->devname, O_RDONLY);
+			if (tfd < 0 || fstat(tfd, &stb) != 0) {
+				fprintf(stderr, Name ": cannot find %s: %s\n",
+					dv->devname, strerror(errno));
+				if (tfd >= 0)
+					close(tfd);
+				return 1;
+			}
+			close(tfd);
+			if ((stb.st_mode & S_IFMT) != S_IFBLK) {
+				fprintf(stderr, Name ": %s is not a "
+					"block device.\n",
+					dv->devname);
+				return 1;
+			}
 		}
 		switch(dv->disposition){
 		default:
@@ -198,28 +446,36 @@ int Manage_subdevs(char *devname, int fd,
 				dv->devname, dv->disposition);
 			return 1;
 		case 'a':
-			/* add the device - hot or cold */
-			st = super_by_version(array.major_version,
-					      array.minor_version);
-			if (!st) {
-				fprintf(stderr, Name ": unsupport array - version %d.%d\n",
-					array.major_version, array.minor_version);
+			/* add the device */
+			if (tst->subarray[0]) {
+				fprintf(stderr, Name ": Cannot add disks to a"
+					" \'member\' array, perform this"
+					" operation on the parent container\n");
 				return 1;
 			}
-
 			/* Make sure it isn't in use (in 2.6 or later) */
-			tfd = open(dv->devname, O_RDONLY|O_EXCL);
+			tfd = dev_open(dv->devname, O_RDONLY|O_EXCL|O_DIRECT);
 			if (tfd < 0) {
 				fprintf(stderr, Name ": Cannot open %s: %s\n",
 					dv->devname, strerror(errno));
 				return 1;
 			}
+			remove_partitions(tfd);
+
+			st = dup_super(tst);
+
 			if (array.not_persistent==0)
-				st->ss->load_super(st, tfd, &osuper, NULL);
-			/* will use osuper later */
+				st->ss->load_super(st, tfd, NULL);
+
+			if (!get_dev_size(tfd, dv->devname, &ldsize)) {
+				close(tfd);
+				return 1;
+			}
 			close(tfd);
 
-			if (array.major_version == 0 &&
+
+			if (!tst->ss->external &&
+			    array.major_version == 0 &&
 			    md_get_version(fd)%100 < 2) {
 				if (ioctl(fd, HOT_ADD_DISK,
 					  (unsigned long)stb.st_rdev)==0) {
@@ -234,12 +490,16 @@ int Manage_subdevs(char *devname, int fd,
 				return 1;
 			}
 
-			if (array.not_persistent == 0) {
+			if (array.not_persistent == 0 || tst->ss->external) {
 
 				/* need to find a sample superblock to copy, and
-				 * a spare slot to use 
+				 * a spare slot to use.
+				 * For 'external' array (well, container based),
+				 * We can just load the metadata for the array.
 				 */
-				for (j=0; j<st->max_devs; j++) {
+				if (tst->ss->external) {
+					tst->ss->load_super(tst, fd, NULL);
+				} else for (j = 0; j < tst->max_devs; j++) {
 					char *dev;
 					int dfd;
 					disc.number = j;
@@ -249,52 +509,97 @@ int Manage_subdevs(char *devname, int fd,
 						continue;
 					if ((disc.state & 4)==0) continue; /* sync */
 					/* Looks like a good device to try */
-					dev = map_dev(disc.major, disc.minor);
+					dev = map_dev(disc.major, disc.minor, 1);
 					if (!dev) continue;
-					dfd = open(dev, O_RDONLY);
+					dfd = dev_open(dev, O_RDONLY);
 					if (dfd < 0) continue;
-					if (st->ss->load_super(st, dfd, &dsuper, NULL)) {
+					if (tst->ss->load_super(tst, dfd,
+								NULL)) {
 						close(dfd);
 						continue;
 					}
 					close(dfd);
 					break;
 				}
-				if (!dsuper) {
+				/* FIXME this is a bad test to be using */
+				if (!tst->sb) {
 					fprintf(stderr, Name ": cannot find valid superblock in this array - HELP\n");
 					return 1;
 				}
+
+				/* Make sure device is large enough */
+				if (tst->ss->avail_size(tst, ldsize/512) <
+				    array_size) {
+					fprintf(stderr, Name ": %s not large enough to join array\n",
+						dv->devname);
+					return 1;
+				}
+
 				/* Possibly this device was recently part of the array
 				 * and was temporarily removed, and is now being re-added.
 				 * If so, we can simply re-add it.
 				 */
-				st->ss->uuid_from_super(duuid, dsuper);
-			
-				if (osuper) {
-					st->ss->uuid_from_super(ouuid, osuper);
+				tst->ss->uuid_from_super(tst, duuid);
+
+				/* re-add doesn't work for version-1 superblocks
+				 * before 2.6.18 :-(
+				 */
+				if (array.major_version == 1 &&
+				    get_linux_version() <= 2006018)
+					;
+				else if (st->sb) {
+					st->ss->uuid_from_super(st, ouuid);
 					if (memcmp(duuid, ouuid, sizeof(ouuid))==0) {
-						/* look close enough for now.  Kernel
-						 * will worry about where a bitmap
-						 * based reconstruct is possible
+						/* looks close enough for now.  Kernel
+						 * will worry about whether a bitmap
+						 * based reconstruction is possible.
 						 */
 						struct mdinfo mdi;
-						struct mddev_ident_s ident;
-						st->ss->getinfo_super(&mdi, &ident, osuper);
+						st->ss->getinfo_super(st, &mdi);
 						disc.major = major(stb.st_rdev);
 						disc.minor = minor(stb.st_rdev);
 						disc.number = mdi.disk.number;
 						disc.raid_disk = mdi.disk.raid_disk;
 						disc.state = mdi.disk.state;
+						if (dv->writemostly == 1)
+							disc.state |= 1 << MD_DISK_WRITEMOSTLY;
+						if (dv->writemostly == 2)
+							disc.state &= ~(1 << MD_DISK_WRITEMOSTLY);
 						if (ioctl(fd, ADD_NEW_DISK, &disc) == 0) {
 							if (verbose >= 0)
 								fprintf(stderr, Name ": re-added %s\n", dv->devname);
-							return 0;
+							continue;
+						}
+						if (errno == ENOMEM || errno == EROFS) {
+							fprintf(stderr, Name ": add new device failed for %s: %s\n",
+								dv->devname, strerror(errno));
+							return 1;
 						}
 						/* fall back on normal-add */
 					}
 				}
+				if (dv->re_add) {
+					fprintf(stderr, Name
+						": --re-add for %s to %s is not possible\n",
+						dv->devname, devname);
+					return 1;
+				}
+			} else {
+				/* non-persistent. Must ensure that new drive
+				 * is at least array.size big.
+				 */
+				if (ldsize/512 < array_size) {
+					fprintf(stderr, Name ": %s not large enough to join array\n",
+						dv->devname);
+					return 1;
+				}
 			}
-			for (j=0; j< st->max_devs; j++) {
+			/* in 2.6.17 and earlier, version-1 superblocks won't
+			 * use the number we write, but will choose a free number.
+			 * we must choose the same free number, which requires
+			 * starting at 'raid_disks' and counting up
+			 */
+			for (j = array.raid_disks; j< tst->max_devs; j++) {
 				disc.number = j;
 				if (ioctl(fd, GET_DISK_INFO, &disc))
 					break;
@@ -307,11 +612,21 @@ int Manage_subdevs(char *devname, int fd,
 			disc.minor = minor(stb.st_rdev);
 			disc.number =j;
 			disc.state = 0;
-			if (array.not_persistent==0) {
-				if (dv->writemostly)
+			if (array.not_persistent==0 || tst->ss->external) {
+				int dfd;
+				if (dv->writemostly == 1)
 					disc.state |= 1 << MD_DISK_WRITEMOSTLY;
-				st->ss->add_to_super(dsuper, &disc);
-				if (st->ss->write_init_super(st, dsuper, &disc, dv->devname))
+				dfd = dev_open(dv->devname, O_RDWR | O_EXCL|O_DIRECT);
+				if (tst->ss->add_to_super(tst, &disc, dfd,
+							  dv->devname)) {
+					close(dfd);
+					return 1;
+				}
+				/* write_init_super will close 'dfd' */
+				if (tst->ss->external)
+					/* mdmon will write the metadata */
+					close(dfd);
+				else if (tst->ss->write_init_super(tst))
 					return 1;
 			} else if (dv->re_add) {
 				/*  this had better be raid1.
@@ -320,7 +635,7 @@ int Manage_subdevs(char *devname, int fd,
 				 */
 				char *used = malloc(array.raid_disks);
 				memset(used, 0, array.raid_disks);
-				for (j=0; j< st->max_devs; j++) {
+				for (j=0; j< tst->max_devs; j++) {
 					mdu_disk_info_t disc2;
 					disc2.number = j;
 					if (ioctl(fd, GET_DISK_INFO, &disc2))
@@ -341,8 +656,57 @@ int Manage_subdevs(char *devname, int fd,
 						disc.state |= (1<<MD_DISK_SYNC);
 						break;
 					}
+				free(used);
 			}
-			if (ioctl(fd,ADD_NEW_DISK, &disc)) {
+			if (dv->writemostly == 1)
+				disc.state |= (1 << MD_DISK_WRITEMOSTLY);
+			if (tst->ss->external) {
+				/* add a disk to an external metadata container
+				 * only if mdmon is around to see it
+				 */
+				struct mdinfo new_mdi;
+				struct mdinfo *sra;
+				int container_fd;
+				int devnum = fd2devnum(fd);
+
+				container_fd = open_dev_excl(devnum);
+				if (container_fd < 0) {
+					fprintf(stderr, Name ": add failed for %s:"
+						" could not get exclusive access to container\n",
+						dv->devname);
+					return 1;
+				}
+
+				if (!mdmon_running(devnum)) {
+					fprintf(stderr, Name ": add failed for %s: mdmon not running\n",
+						dv->devname);
+					close(container_fd);
+					return 1;
+				}
+
+				sra = sysfs_read(container_fd, -1, 0);
+				if (!sra) {
+					fprintf(stderr, Name ": add failed for %s: sysfs_read failed\n",
+						dv->devname);
+					close(container_fd);
+					return 1;
+				}
+				sra->array.level = LEVEL_CONTAINER;
+				/* Need to set data_offset and component_size */
+				tst->ss->getinfo_super(tst, &new_mdi);
+				new_mdi.disk.major = disc.major;
+				new_mdi.disk.minor = disc.minor;
+				new_mdi.recovery_start = 0;
+				if (sysfs_add_disk(sra, &new_mdi) != 0) {
+					fprintf(stderr, Name ": add new device to external metadata"
+						" failed for %s\n", dv->devname);
+					close(container_fd);
+					return 1;
+				}
+				ping_monitor(devnum2devname(devnum));
+				sysfs_free(sra);
+				close(container_fd);
+			} else if (ioctl(fd, ADD_NEW_DISK, &disc)) {
 				fprintf(stderr, Name ": add new device failed for %s as %d: %s\n",
 					dv->devname, j, strerror(errno));
 				return 1;
@@ -353,29 +717,126 @@ int Manage_subdevs(char *devname, int fd,
 
 		case 'r':
 			/* hot remove */
+			if (tst->subarray[0]) {
+				fprintf(stderr, Name ": Cannot remove disks from a"
+					" \'member\' array, perform this"
+					" operation on the parent container\n");
+				return 1;
+			}
+			if (tst->ss->external) {
+				/* To remove a device from a container, we must
+				 * check that it isn't in use in an array.
+				 * This involves looking in the 'holders'
+				 * directory - there must be just one entry,
+				 * the container.
+				 * To ensure that it doesn't get used as a
+				 * hold spare while we are checking, we
+				 * get an O_EXCL open on the container
+				 */
+				int dnum = fd2devnum(fd);
+				lfd = open_dev_excl(dnum);
+				if (lfd < 0) {
+					fprintf(stderr, Name
+						": Cannot get exclusive access "
+						" to container - odd\n");
+					return 1;
+				}
+				/* in the detached case it is not possible to
+				 * check if we are the unique holder, so just
+				 * rely on the 'detached' checks
+				 */
+				if (strcmp(dv->devname, "detached") == 0 ||
+				    sysfs_unique_holder(dnum, stb.st_rdev))
+					/* pass */;
+				else {
+					fprintf(stderr, Name
+						": %s is %s, cannot remove.\n",
+						dnprintable,
+						errno == EEXIST ? "still in use":
+						"not a member");
+					close(lfd);
+					return 1;
+				}
+			}
 			/* FIXME check that it is a current member */
-			if (ioctl(fd, HOT_REMOVE_DISK, (unsigned long)stb.st_rdev)) {
-				fprintf(stderr, Name ": hot remove failed for %s: %s\n",
-					dv->devname, strerror(errno));
+			err = ioctl(fd, HOT_REMOVE_DISK, (unsigned long)stb.st_rdev);
+			if (err && errno == ENODEV) {
+				/* Old kernels rejected this if no personality
+				 * registered */
+				struct mdinfo *sra = sysfs_read(fd, 0, GET_DEVS);
+				struct mdinfo *dv = NULL;
+				if (sra)
+					dv = sra->devs;
+				for ( ; dv ; dv=dv->next)
+					if (dv->disk.major == major(stb.st_rdev) &&
+					    dv->disk.minor == minor(stb.st_rdev))
+						break;
+				if (dv)
+					err = sysfs_set_str(sra, dv,
+							    "state", "remove");
+				else
+					err = -1;
+				if (sra)
+					sysfs_free(sra);
+			}
+			if (err) {
+				fprintf(stderr, Name ": hot remove failed "
+					"for %s: %s\n",	dnprintable,
+					strerror(errno));
+				if (lfd >= 0)
+					close(lfd);
 				return 1;
 			}
+			if (tst->ss->external) {
+				/*
+				 * Before dropping our exclusive open we make an
+				 * attempt at preventing mdmon from seeing an
+				 * 'add' event before reconciling this 'remove'
+				 * event.
+				 */
+				char *name = devnum2devname(fd2devnum(fd));
+
+				if (!name) {
+					fprintf(stderr, Name ": unable to get container name\n");
+					return 1;
+				}
+
+				ping_manager(name);
+				free(name);
+			}
+			close(lfd);
 			if (verbose >= 0)
-				fprintf(stderr, Name ": hot removed %s\n", dv->devname);
+				fprintf(stderr, Name ": hot removed %s\n",
+					dnprintable);
 			break;
 
 		case 'f': /* set faulty */
 			/* FIXME check current member */
 			if (ioctl(fd, SET_DISK_FAULTY, (unsigned long) stb.st_rdev)) {
 				fprintf(stderr, Name ": set device faulty failed for %s:  %s\n",
-					dv->devname, strerror(errno));
+					dnprintable, strerror(errno));
 				return 1;
 			}
 			if (verbose >= 0)
 				fprintf(stderr, Name ": set %s faulty in %s\n",
-					dv->devname, devname);
+					dnprintable, devname);
 			break;
 		}
 	}
 	return 0;
-	
+
+}
+
+int autodetect(void)
+{
+	/* Open any md device, and issue the RAID_AUTORUN ioctl */
+	int rv = 1;
+	int fd = dev_open("9:0", O_RDONLY);
+	if (fd >= 0) {
+		if (ioctl(fd, RAID_AUTORUN, 0) == 0)
+			rv = 0;
+		close(fd);
+	}
+	return rv;
 }
+#endif