X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Incremental.c;h=d4d3c353560d8fb4946c8fad1b0840a0de82e0dd;hp=41876b9e70c3c00ca9bfc715176c25b61b24390c;hb=7039d1f8200b9599b23db5953934fdb43b0442e0;hpb=8360760457860206e2719c069b30552e79018c59 diff --git a/Incremental.c b/Incremental.c index 41876b9e..d4d3c353 100644 --- a/Incremental.c +++ b/Incremental.c @@ -86,7 +86,7 @@ int Incremental(struct mddev_dev *devlist, struct context *c, * - if number of OK devices match expected, or -R and there are enough, * start the array (auto-readonly). */ - struct stat stb; + dev_t rdev, rdev2; struct mdinfo info, dinfo; struct mdinfo *sra = NULL, *d; struct mddev_ident *match; @@ -99,26 +99,16 @@ int Incremental(struct mddev_dev *devlist, struct context *c, int active_disks; int trustworthy; char *name_to_use; - mdu_array_info_t ainf; struct dev_policy *policy = NULL; struct map_ent target_array; int have_target; char *devname = devlist->devname; + int journal_device_missing = 0; struct createinfo *ci = conf_get_create_info(); - if (stat(devname, &stb) < 0) { - if (c->verbose >= 0) - pr_err("stat failed for %s: %s.\n", - devname, strerror(errno)); - return rv; - } - if ((stb.st_mode & S_IFMT) != S_IFBLK) { - if (c->verbose >= 0) - pr_err("%s is not a block device.\n", - devname); + if (!stat_is_blkdev(devname, &rdev)) return rv; - } dfd = dev_open(devname, O_RDONLY); if (dfd < 0) { if (c->verbose >= 0) @@ -157,10 +147,8 @@ int Incremental(struct mddev_dev *devlist, struct context *c, if (!devlist) { devlist = conf_get_devs(); for (;devlist; devlist = devlist->next) { - struct stat st2; - if (stat(devlist->devname, &st2) == 0 && - (st2.st_mode & S_IFMT) == S_IFBLK && - st2.st_rdev == stb.st_rdev) + if (stat_is_blkdev(devlist->devname, &rdev2) && + rdev2 == rdev) break; } } @@ -174,21 +162,11 @@ int Incremental(struct mddev_dev *devlist, struct context *c, /* 2/ Find metadata, reject if none appropriate (check * version/name from args) */ - if (fstat(dfd, &stb) < 0) { - if (c->verbose >= 0) - pr_err("fstat failed for %s: %s.\n", - devname, strerror(errno)); - goto out; - } - if ((stb.st_mode & S_IFMT) != S_IFBLK) { - if (c->verbose >= 0) - pr_err("%s is not a block device.\n", - devname); + if (!fstat_is_blkdev(dfd, devname, &rdev)) goto out; - } - dinfo.disk.major = major(stb.st_rdev); - dinfo.disk.minor = minor(stb.st_rdev); + dinfo.disk.major = major(rdev); + dinfo.disk.minor = minor(rdev); policy = disk_policy(&dinfo); have_target = policy_check_path(&dinfo, &target_array); @@ -224,8 +202,8 @@ int Incremental(struct mddev_dev *devlist, struct context *c, if (!match && rv == 2) goto out; - if (match && match->devname - && strcasecmp(match->devname, "") == 0) { + if (match && match->devname && + strcasecmp(match->devname, "") == 0) { if (c->verbose >= 0) pr_err("array containing %s is explicitly ignored by mdadm.conf\n", devname); @@ -266,8 +244,7 @@ int Incremental(struct mddev_dev *devlist, struct context *c, c->autof = ci->autof; name_to_use = info.name; - if (name_to_use[0] == 0 && - info.array.level == LEVEL_CONTAINER) { + if (name_to_use[0] == 0 && info.array.level == LEVEL_CONTAINER) { name_to_use = info.text_version; trustworthy = METADATA; } @@ -312,14 +289,25 @@ int Incremental(struct mddev_dev *devlist, struct context *c, if (mdfd < 0) { + /* Skip the clustered ones. This should be started by + * clustering resource agents + */ + if (info.array.state & (1 << MD_SB_CLUSTERED)) + goto out; + /* Couldn't find an existing array, maybe make a new one */ mdfd = create_mddev(match ? match->devname : NULL, - name_to_use, c->autof, trustworthy, chosen_name); + name_to_use, c->autof, trustworthy, chosen_name, 0); if (mdfd < 0) goto out_unlock; - sysfs_init(&info, mdfd, NULL); + if (sysfs_init(&info, mdfd, NULL)) { + pr_err("unable to initialize sysfs for %s\n", + chosen_name); + rv = 2; + goto out_unlock; + } if (set_array_info(mdfd, st, &info) != 0) { pr_err("failed to set array info for %s: %s\n", @@ -329,8 +317,8 @@ int Incremental(struct mddev_dev *devlist, struct context *c, } dinfo = info; - dinfo.disk.major = major(stb.st_rdev); - dinfo.disk.minor = minor(stb.st_rdev); + dinfo.disk.major = major(rdev); + dinfo.disk.minor = minor(rdev); if (add_disk(mdfd, st, &info, &dinfo) != 0) { pr_err("failed to add %s to new array %s: %s.\n", devname, chosen_name, strerror(errno)); @@ -386,12 +374,11 @@ int Incremental(struct mddev_dev *devlist, struct context *c, * flag has a different meaning. The test has to happen * at the device level there */ - if (!st->ss->external - && (info.disk.state & (1<ss->name, - act_re_add) - && c->runstop < 1) { - if (ioctl(mdfd, GET_ARRAY_INFO, &ainf) == 0) { + if (!st->ss->external && + (info.disk.state & (1 << MD_DISK_SYNC)) != 0 && + !policy_action_allows(policy, st->ss->name, act_re_add) && + c->runstop < 1) { + if (md_array_active(mdfd)) { pr_err("not adding %s to active array (without --run) %s\n", devname, chosen_name); rv = 2; @@ -432,11 +419,15 @@ int Incremental(struct mddev_dev *devlist, struct context *c, goto out_unlock; } } - info.disk.major = major(stb.st_rdev); - info.disk.minor = minor(stb.st_rdev); + info.disk.major = major(rdev); + info.disk.minor = minor(rdev); /* add disk needs to know about containers */ if (st->ss->external) sra->array.level = LEVEL_CONTAINER; + + if (info.array.state & (1 << MD_SB_CLUSTERED)) + info.disk.state |= (1 << MD_DISK_CLUSTER_ADD); + err = add_disk(mdfd, st, sra, &info); if (err < 0 && errno == EBUSY) { /* could be another device present with the same @@ -514,9 +505,14 @@ int Incremental(struct mddev_dev *devlist, struct context *c, sra = sysfs_read(mdfd, NULL, (GET_DEVS | GET_STATE | GET_OFFSET | GET_SIZE)); active_disks = count_active(st, sra, mdfd, &avail, &info); + + journal_device_missing = (info.journal_device_required) && (info.journal_clean == 0); + + if (info.consistency_policy == CONSISTENCY_POLICY_PPL) + info.array.state |= 1; + if (enough(info.array.level, info.array.raid_disks, - info.array.layout, info.array.state & 1, - avail) == 0) { + info.array.layout, info.array.state & 1, avail) == 0) { if (c->export) { printf("MD_STARTED=no\n"); } else if (c->verbose >= 0) @@ -532,7 +528,7 @@ int Incremental(struct mddev_dev *devlist, struct context *c, /* + add any bitmap file */ /* + start the array (auto-readonly). */ - if (ioctl(mdfd, GET_ARRAY_INFO, &ainf) == 0) { + if (md_array_active(mdfd)) { if (c->export) { printf("MD_STARTED=already\n"); } else if (c->verbose >= 0) @@ -543,10 +539,12 @@ int Incremental(struct mddev_dev *devlist, struct context *c, } map_unlock(&map); - if (c->runstop > 0 || active_disks >= info.array.working_disks) { + if (c->runstop > 0 || (!journal_device_missing && active_disks >= info.array.working_disks)) { struct mdinfo *dsk; /* Let's try to start it */ + if (journal_device_missing) + pr_err("Trying to run with missing journal device\n"); if (info.reshape_active && !(info.reshape_active & RESHAPE_NO_BACKUP)) { pr_err("%s: This array is being reshaped and cannot be started\n", chosen_name); @@ -575,8 +573,8 @@ int Incremental(struct mddev_dev *devlist, struct context *c, if (d->disk.state & (1<= info.array.working_disks) - && trustworthy != FOREIGN) + if ((sra == NULL || active_disks >= info.array.working_disks) && + trustworthy != FOREIGN) rv = ioctl(mdfd, RUN_ARRAY, NULL); else rv = sysfs_set_str(sra, NULL, @@ -600,7 +598,8 @@ int Incremental(struct mddev_dev *devlist, struct context *c, * those devices we should re-add them now. */ for (dsk = sra->devs; dsk ; dsk = dsk->next) { - if (disk_action_allows(dsk, st->ss->name, act_re_add) && + if (disk_action_allows(dsk, st->ss->name, + act_re_add) && add_disk(mdfd, st, sra, dsk) == 0) pr_err("%s re-added to %s\n", dsk->sys_name, chosen_name); @@ -613,6 +612,8 @@ int Incremental(struct mddev_dev *devlist, struct context *c, } else { if (c->export) { printf("MD_STARTED=unsafe\n"); + } else if (journal_device_missing) { + pr_err("Journal device is missing, not safe to start yet.\n"); } else if (c->verbose >= 0) pr_err("%s attached to %s, not enough to start safely.\n", devname, chosen_name); @@ -626,8 +627,7 @@ out: close(mdfd); if (policy) dev_policy_free(policy); - if (sra) - sysfs_free(sra); + sysfs_free(sra); return rv; out_unlock: map_unlock(&map); @@ -642,14 +642,13 @@ static void find_reject(int mdfd, struct supertype *st, struct mdinfo *sra, * and events less than the passed events, and remove the device. */ struct mdinfo *d; - mdu_array_info_t ra; - if (ioctl(mdfd, GET_ARRAY_INFO, &ra) == 0) + if (md_array_active(mdfd)) return; /* not safe to remove from active arrays * without thinking more */ for (d = sra->devs; d ; d = d->next) { - char dn[10]; + char dn[24]; // 2*11 bytes for ints (including sign) + colon + null byte int dfd; struct mdinfo info; sprintf(dn, "%d:%d", d->disk.major, d->disk.minor); @@ -664,8 +663,7 @@ static void find_reject(int mdfd, struct supertype *st, struct mdinfo *sra, st->ss->free_super(st); close(dfd); - if (info.disk.number != number || - info.events >= events) + if (info.disk.number != number || info.events >= events) continue; if (d->disk.raid_disk > -1) @@ -686,6 +684,7 @@ static int count_active(struct supertype *st, struct mdinfo *sra, int cnt = 0; int replcnt = 0; __u64 max_events = 0; + __u64 max_journal_events = 0; char *avail = NULL; int *best = NULL; char *devmap = NULL; @@ -713,8 +712,12 @@ static int count_active(struct supertype *st, struct mdinfo *sra, close(dfd); if (ok != 0) continue; + info.array.raid_disks = raid_disks; st->ss->getinfo_super(st, &info, devmap + raid_disks * devnum); + if (info.disk.raid_disk == MD_DISK_ROLE_JOURNAL && + info.events > max_journal_events) + max_journal_events = info.events; if (!avail) { raid_disks = info.array.raid_disks; avail = xcalloc(raid_disks, 1); @@ -764,6 +767,9 @@ static int count_active(struct supertype *st, struct mdinfo *sra, replcnt++; st->ss->free_super(st); } + if (max_journal_events >= max_events - 1) + bestinfo->journal_clean = 1; + if (!avail) return 0; /* We need to reject any device that thinks the best device is @@ -800,28 +806,28 @@ static int count_active(struct supertype *st, struct mdinfo *sra, } /* test if container has degraded member(s) */ -static int container_members_max_degradation(struct map_ent *map, struct map_ent *me) +static int +container_members_max_degradation(struct map_ent *map, struct map_ent *me) { - mdu_array_info_t array; - int afd; - int max_degraded = 0; + struct mdinfo *sra; + int degraded, max_degraded = 0; for(; map; map = map->next) { if (!metadata_container_matches(map->metadata, me->devnm)) continue; - afd = open_dev(map->devnm); - if (afd < 0) - continue; /* most accurate information regarding array degradation */ - if (ioctl(afd, GET_ARRAY_INFO, &array) >= 0) { - int degraded = array.raid_disks - array.active_disks - - array.spare_disks; - if (degraded > max_degraded) - max_degraded = degraded; - } - close(afd); + sra = sysfs_read(-1, map->devnm, + GET_DISKS | GET_DEVS | GET_STATE); + if (!sra) + continue; + degraded = sra->array.raid_disks - sra->array.active_disks - + sra->array.spare_disks; + if (degraded > max_degraded) + max_degraded = degraded; + sysfs_free(sra); } - return (max_degraded); + + return max_degraded; } static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, @@ -839,12 +845,12 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, * Return 0 on success, or some exit code on failure, probably 1. */ int rv = 1; - struct stat stb; + dev_t rdev; struct map_ent *mp, *map = NULL; struct mdinfo *chosen = NULL; int dfd = *dfdp; - if (fstat(dfd, &stb) != 0) + if (!fstat_is_blkdev(dfd, devname, &rdev)) return 1; /* @@ -864,8 +870,8 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, struct supertype *st2; struct domainlist *dl = NULL; struct mdinfo *sra; - unsigned long long devsize; - unsigned long long component_size = 0; + unsigned long long devsize, freesize = 0; + struct spare_criteria sc = {0, 0}; if (is_subarray(mp->metadata)) continue; @@ -884,16 +890,10 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, } sra = sysfs_read(-1, mp->devnm, GET_DEVS|GET_OFFSET|GET_SIZE|GET_STATE| - GET_DEGRADED|GET_COMPONENT|GET_VERSION); - if (!sra) { - /* Probably a container - no degraded info */ - sra = sysfs_read(-1, mp->devnm, - GET_DEVS|GET_OFFSET|GET_SIZE|GET_STATE| - GET_COMPONENT|GET_VERSION); - if (sra) - sra->array.failed_disks = -1; - } - if (!sra) + GET_COMPONENT|GET_VERSION); + if (sra) + sra->array.failed_disks = -1; + else continue; if (st == NULL) { int i; @@ -934,20 +934,22 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, } if (st3->ss->load_container && !st3->ss->load_container(st3, mdfd, mp->path)) { - component_size = st3->ss->min_acceptable_spare_size(st3); + if (st3->ss->get_spare_criteria) + st3->ss->get_spare_criteria(st3, &sc); st3->ss->free_super(st3); } free(st3); close(mdfd); } if ((sra->component_size > 0 && - st2->ss->avail_size(st2, devsize, - sra->devs - ? sra->devs->data_offset - : INVALID_SECTORS) - < sra->component_size) - || - (sra->component_size == 0 && devsize < component_size)) { + st2->ss->validate_geometry(st2, sra->array.level, sra->array.layout, + sra->array.raid_disks, &sra->array.chunk_size, + sra->component_size, + sra->devs ? sra->devs->data_offset : INVALID_SECTORS, + devname, &freesize, sra->consistency_policy, + 0) && + freesize < sra->component_size) || + (sra->component_size == 0 && devsize < sc.min_size)) { if (verbose > 1) pr_err("not adding %s to %s as it is too small\n", devname, mp->path); @@ -967,8 +969,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, sizeof(target->uuid)) == 0 && sra->array.failed_disks > 0) { /* This is our target!! */ - if (chosen) - sysfs_free(chosen); + sysfs_free(chosen); chosen = sra; sra = NULL; /* skip to end so we don't check any more */ @@ -1000,8 +1001,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, sra = NULL; } next: - if (sra) - sysfs_free(sra); + sysfs_free(sra); if (st != st2) free(st2); if (dl) @@ -1012,13 +1012,14 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol, int mdfd = open_dev(chosen->sys_name); if (mdfd >= 0) { struct mddev_dev devlist; - char devname[20]; + char chosen_devname[24]; // 2*11 for int (including signs) + colon + null devlist.next = NULL; devlist.used = 0; - devlist.writemostly = 0; - devlist.devname = devname; - sprintf(devname, "%d:%d", major(stb.st_rdev), - minor(stb.st_rdev)); + devlist.writemostly = FlagDefault; + devlist.failfast = FlagDefault; + devlist.devname = chosen_devname; + sprintf(chosen_devname, "%d:%d", major(rdev), + minor(rdev)); devlist.disposition = 'a'; close(dfd); *dfdp = -1; @@ -1079,9 +1080,9 @@ static int partition_try_spare(char *devname, int *dfdp, struct dev_policy *pol, struct supertype *st2 = NULL; char *devname = NULL; unsigned long long devsectors; + char *pathlist[2]; - if (de->d_ino == 0 || - de->d_name[0] == '.' || + if (de->d_ino == 0 || de->d_name[0] == '.' || (de->d_type != DT_LNK && de->d_type != DT_UNKNOWN)) goto next; @@ -1094,7 +1095,9 @@ static int partition_try_spare(char *devname, int *dfdp, struct dev_policy *pol, /* This is a partition - skip it */ goto next; - pol2 = path_policy(de->d_name, type_disk); + pathlist[0] = de->d_name; + pathlist[1] = NULL; + pol2 = path_policy(pathlist, type_disk); domain_merge(&domlist, pol2, st ? st->ss->name : NULL); if (domain_test(domlist, pol, st ? st->ss->name : NULL) != 1) @@ -1119,8 +1122,7 @@ static int partition_try_spare(char *devname, int *dfdp, struct dev_policy *pol, st2 = dup_super(st); else st2 = guess_super_type(fd, guess_partitions); - if (st2 == NULL || - st2->ss->load_super(st2, fd, NULL) < 0) + if (st2 == NULL || st2->ss->load_super(st2, fd, NULL) < 0) goto next; st2->ignore_hw_compat = 0; @@ -1148,8 +1150,7 @@ static int partition_try_spare(char *devname, int *dfdp, struct dev_policy *pol, * metadata which makes better use of the device can * be found. */ - if (chosen == NULL || - chosen_size < info.component_size) { + if (chosen == NULL || chosen_size < info.component_size) { chosen_size = info.component_size; free(chosen); chosen = devname; @@ -1270,7 +1271,7 @@ static int try_spare(char *devname, int *dfdp, struct dev_policy *pol, * what arrays might be candidates. */ if (st) { - /* just try try 'array' or 'partition' based on this metadata */ + /* just try to add 'array' or 'partition' based on this metadata */ if (st->ss->add_to_super) return array_try_spare(devname, dfdp, pol, target, bare, st, verbose); @@ -1321,15 +1322,17 @@ int IncrementalScan(struct context *c, char *devnm) restart: for (me = mapl ; me ; me = me->next) { - mdu_array_info_t array; - mdu_bitmap_file_t bmf; struct mdinfo *sra; int mdfd; if (devnm && strcmp(devnm, me->devnm) != 0) continue; - if (devnm && me->metadata[0] == '/') { + if (me->metadata[0] == '/') { char *sl; + + if (!devnm) + continue; + /* member array, need to work on container */ strncpy(container, me->metadata+1, 32); container[31] = 0; @@ -1363,15 +1366,14 @@ restart: rv = 1; continue; } - if (ioctl(mdfd, GET_ARRAY_INFO, &array) == 0 || - errno != ENODEV) { + if (md_array_active(mdfd)) { close(mdfd); continue; } /* Ok, we can try this one. Maybe it needs a bitmap */ for (mddev = devs ; mddev ; mddev = mddev->next) - if (mddev->devname && me->path - && devname_matches(mddev->devname, me->path)) + if (mddev->devname && me->path && + devname_matches(mddev->devname, me->path)) break; if (mddev && mddev->bitmap_file) { /* @@ -1379,13 +1381,12 @@ restart: * is a hint only */ int added = -1; - if (ioctl(mdfd, GET_ARRAY_INFO, &bmf) < 0) { - int bmfd = open(mddev->bitmap_file, O_RDWR); - if (bmfd >= 0) { - added = ioctl(mdfd, SET_BITMAP_FILE, - bmfd); - close(bmfd); - } + int bmfd; + + bmfd = open(mddev->bitmap_file, O_RDWR); + if (bmfd >= 0) { + added = ioctl(mdfd, SET_BITMAP_FILE, bmfd); + close(bmfd); } if (c->verbose >= 0) { if (added == 0) @@ -1415,6 +1416,7 @@ restart: sysfs_free(sra); } } + map_free(mapl); return rv; } @@ -1576,7 +1578,7 @@ static int Incremental_container(struct supertype *st, char *devname, ra->name, c->autof, trustworthy, - chosen_name); + chosen_name, 0); } if (only && (!mp || strcmp(mp->devnm, only) != 0)) continue; @@ -1589,6 +1591,8 @@ static int Incremental_container(struct supertype *st, char *devname, assemble_container_content(st, mdfd, ra, c, chosen_name, &result); + map_free(map); + map = NULL; close(mdfd); } if (c->export && result) { @@ -1628,12 +1632,15 @@ static int Incremental_container(struct supertype *st, char *devname, struct supertype *sst = super_imsm.match_metadata_desc("imsm"); struct mdinfo *sinfo; - unsigned long long min_size = 0; - if (st->ss->min_acceptable_spare_size) - min_size = st->ss->min_acceptable_spare_size(st); + if (!sst->ss->load_container(sst, sfd, NULL)) { + struct spare_criteria sc = {0, 0}; + + if (st->ss->get_spare_criteria) + st->ss->get_spare_criteria(st, &sc); + close(sfd); - sinfo = container_choose_spares(sst, min_size, + sinfo = container_choose_spares(sst, &sc, domains, NULL, st->ss->name, 0); sst->ss->free_super(sst); @@ -1662,6 +1669,7 @@ static int Incremental_container(struct supertype *st, char *devname, close(sfd); } domain_free(domains); + map_free(map); return 0; } @@ -1678,6 +1686,44 @@ static void run_udisks(char *arg1, char *arg2) ; } +static int force_remove(char *devnm, int fd, struct mdinfo *mdi, int verbose) +{ + int rv; + int devid = devnm2devid(devnm); + + run_udisks("--unmount", map_dev(major(devid), minor(devid), 0)); + rv = Manage_stop(devnm, fd, verbose, 1); + if (rv) { + /* At least we can try to trigger a 'remove' */ + sysfs_uevent(mdi, "remove"); + if (verbose) + pr_err("Fail to stop %s too.\n", devnm); + } + return rv; +} + +static void remove_from_member_array(struct mdstat_ent *memb, + struct mddev_dev *devlist, int verbose) +{ + int rv; + struct mdinfo mmdi; + int subfd = open_dev(memb->devnm); + + if (subfd >= 0) { + rv = Manage_subdevs(memb->devnm, subfd, devlist, verbose, + 0, NULL, 0); + if (rv & 2) { + if (sysfs_init(&mmdi, -1, memb->devnm)) + pr_err("unable to initialize sysfs for: %s\n", + memb->devnm); + else + force_remove(memb->devnm, subfd, &mmdi, + verbose); + } + close(subfd); + } +} + /* * IncrementalRemove - Attempt to see if the passed in device belongs to any * raid arrays, and if so first fail (if needed) and then remove the device. @@ -1710,7 +1756,10 @@ int IncrementalRemove(char *devname, char *id_path, int verbose) pr_err("%s does not appear to be a component of any array\n", devname); return 1; } - sysfs_init(&mdi, -1, ent->devnm); + if (sysfs_init(&mdi, -1, ent->devnm)) { + pr_err("unable to initialize sysfs for: %s\n", devname); + return 1; + } mdfd = open_dev_excl(ent->devnm); if (mdfd > 0) { close(mdfd); @@ -1746,40 +1795,28 @@ int IncrementalRemove(char *devname, char *id_path, int verbose) strncmp(ent->metadata_version, "external:", 9) == 0) { struct mdstat_ent *mdstat = mdstat_read(0, 0); struct mdstat_ent *memb; - for (memb = mdstat ; memb ; memb = memb->next) - if (is_container_member(memb, ent->devnm)) { - int subfd = open_dev(memb->devnm); - if (subfd >= 0) { - rv |= Manage_subdevs( - memb->devnm, subfd, - &devlist, verbose, 0, - NULL, 0); - close(subfd); - } - } + for (memb = mdstat ; memb ; memb = memb->next) { + if (is_container_member(memb, ent->devnm)) + remove_from_member_array(memb, + &devlist, verbose); + } free_mdstat(mdstat); - } else + } else { rv |= Manage_subdevs(ent->devnm, mdfd, &devlist, verbose, 0, NULL, 0); - if (rv & 2) { + if (rv & 2) { /* Failed due to EBUSY, try to stop the array. * Give udisks a chance to unmount it first. */ - int devid = devnm2devid(ent->devnm); - run_udisks("--unmount", map_dev(major(devid),minor(devid), 0)); - rv = Manage_stop(ent->devnm, mdfd, verbose, 1); - if (rv) - /* At least we can try to trigger a 'remove' */ - sysfs_uevent(&mdi, "remove"); - if (verbose) { - if (rv) - pr_err("Fail to stop %s too.\n", ent->devnm); + rv = force_remove(ent->devnm, mdfd, &mdi, verbose); + goto end; } - } else { - devlist.disposition = 'r'; - rv = Manage_subdevs(ent->devnm, mdfd, &devlist, - verbose, 0, NULL, 0); } + + devlist.disposition = 'r'; + rv = Manage_subdevs(ent->devnm, mdfd, &devlist, + verbose, 0, NULL, 0); +end: close(mdfd); free_mdstat(ent); return rv;