*
*/
mdu_array_info_t array;
-
+
if (md_get_version(fd) < 9000) {
fprintf(stderr, Name ": need md driver version 0.90.0 or later\n");
return 1;
devname);
return 1;
}
-
+
if (readonly>0) {
if (ioctl(fd, STOP_ARRAY_RO, NULL)) {
fprintf(stderr, Name ": failed to set readonly for %s: %s\n",
return 1;
}
}
- return 0;
+ return 0;
}
#ifndef MDASSEMBLE
return 1;
}
}
-
+
if (md_get_version(fd) < 9000) {
fprintf(stderr, Name ": need md driver version 0.90.0 or later\n");
return 1;
return 0;
}
+static int
+add_remove_device_container(int fd, int add_remove, struct stat *stb)
+{
+ int devnum = fd2devnum(fd);
+ char *devname = devnum2devname(devnum);
+ int sfd = devname ? connect_monitor(devname) : -1;
+ struct md_message msg;
+ int err = 0;
+
+ if (devname && sfd < 0) {
+ fprintf(stderr, Name ": Cannot connect to monitor for %s: %s\n",
+ devname, strerror(errno));
+ free(devname);
+ return 1;
+ } else if (sfd < 0) {
+ fprintf(stderr, Name ": Cannot determine container name for"
+ " device number %d\n", devnum);
+ return 1;
+ }
+
+ if (add_remove)
+ ack(sfd, 0, 0);
+ else if (send_remove_device(sfd, stb->st_rdev, 0, 0) != 0) {
+ fprintf(stderr, Name ": Failed to send \'%s device\'"
+ " message to the container monitor\n",
+ add_remove ? "add" : "remove");
+ err = 1;
+ }
+
+ /* check the reply */
+ if (!err && receive_message(sfd, &msg, 0) != 0) {
+ fprintf(stderr, Name ": Failed to receive an acknowledgement"
+ " from the container monitor\n");
+ err = 1;
+ }
+
+ if (!err && msg.seq != 0) {
+ fprintf(stderr, Name ": %s device failed error code %d\n",
+ add_remove ? "Add" : "Remove", msg.seq);
+ err = 1;
+ }
+
+ free(devname);
+ close(sfd);
+
+ return err;
+}
+
int Manage_subdevs(char *devname, int fd,
mddev_dev_t devlist, int verbose)
{
*/
mdu_array_info_t array;
mdu_disk_info_t disc;
+ unsigned long long array_size;
mddev_dev_t dv, next = NULL;
struct stat stb;
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];
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];
return 1;
case 'a':
/* add the device */
- 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);
+ if (tst == &supertype_container_member) {
+ fprintf(stderr, Name ": Cannot add disks to a"
+ " \'member\' array, perform this"
+ " operation on the parent container\n");
return 1;
- }
-
+ } else if (tst->ss->external)
+ return add_remove_device_container(fd, 1, &stb);
/* Make sure it isn't in use (in 2.6 or later) */
tfd = open(dv->devname, O_RDONLY|O_EXCL);
if (tfd < 0) {
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;
if (array.not_persistent == 0) {
/* Make sure device is large enough */
- if (st->ss->avail_size(st, ldsize/512) <
- array.size) {
+ 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;
}
/* need to find a sample superblock to copy, and
- * a spare slot to use
+ * a spare slot to use
*/
- for (j=0; j<st->max_devs; j++) {
+ for (j = 0; j < tst->max_devs; j++) {
char *dev;
int dfd;
disc.number = j;
if (!dev) continue;
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;
}
- remove_partitions(dfd);
close(dfd);
break;
}
- if (!dsuper) {
+ if (!tst->sb) {
fprintf(stderr, Name ": cannot find valid superblock in this array - HELP\n");
return 1;
}
* 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);
+ 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 (osuper) {
- st->ss->uuid_from_super(ouuid, osuper);
+ else if (st->sb) {
+ st->ss->uuid_from_super(st, ouuid);
if (memcmp(duuid, ouuid, sizeof(ouuid))==0) {
/* looks close enough for now. Kernel
* will worry about whether a bitmap
* based reconstruction is possible.
*/
struct mdinfo mdi;
- st->ss->getinfo_super(&mdi, osuper);
+ st->ss->getinfo_super(st, &mdi);
disc.major = major(stb.st_rdev);
disc.minor = minor(stb.st_rdev);
disc.number = mdi.disk.number;
/* non-persistent. Must ensure that new drive
* is at least array.size big.
*/
- if (ldsize/512 < array.size) {
+ if (ldsize/512 < array_size) {
fprintf(stderr, Name ": %s not large enough to join array\n",
dv->devname);
return 1;
* we must choose the same free number, which requires
* starting at 'raid_disks' and counting up
*/
- for (j = array.raid_disks; j< st->max_devs; j++) {
+ for (j = array.raid_disks; j< tst->max_devs; j++) {
disc.number = j;
if (ioctl(fd, GET_DISK_INFO, &disc))
break;
disc.number =j;
disc.state = 0;
if (array.not_persistent==0) {
+ int dfd;
if (dv->writemostly)
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 = open(dv->devname, O_RDWR | O_EXCL);
+ tst->ss->add_to_super(tst, &disc, dfd,
+ dv->devname);
+ /* write_init_super will close 'dfd' */
+ if (tst->ss->write_init_super(tst))
return 1;
} else if (dv->re_add) {
/* this had better be raid1.
*/
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))
case 'r':
/* hot remove */
+ if (tst == &supertype_container_member) {
+ fprintf(stderr, Name ": Cannot remove disks from a"
+ " \'member\' array, perform this"
+ " operation on the parent container\n");
+ return 1;
+ } else if (tst->ss->external)
+ return add_remove_device_container(fd, 0, &stb);
/* 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 "
}
}
return 0;
-
+
}
int autodetect(void)
projects / thirdparty / mdadm.git / blobdiff