devname);
return rv;
}
- dfd = dev_open(devname, O_RDONLY|O_EXCL);
+ dfd = dev_open(devname, O_RDONLY);
if (dfd < 0) {
if (c->verbose >= 0)
pr_err("cannot open %s: %s.\n",
if (must_be_container(dfd)) {
if (!st)
st = super_by_fd(dfd, NULL);
+ if (st)
+ st->ignore_hw_compat = 1;
if (st && st->ss->load_container)
rv = st->ss->load_container(st, dfd, NULL);
st, c->verbose);
goto out;
}
+ st->ignore_hw_compat = 1;
if (st->ss->compare_super == NULL ||
st->ss->load_super(st, dfd, NULL)) {
if (c->verbose >= 0)
if (map_lock(&map))
pr_err("failed to get exclusive lock on "
"mapfile\n");
+ /* Now check we can get O_EXCL. If not, probably "mdadm -A" has
+ * taken over
+ */
+ dfd = dev_open(devname, O_RDONLY|O_EXCL);
+ if (dfd < 0) {
+ if (c->verbose >= 0)
+ pr_err("cannot reopen %s: %s.\n",
+ devname, strerror(errno));
+ goto out_unlock;
+ }
+ /* Cannot hold it open while we add the device to the array,
+ * so we must release the O_EXCL and depend on the map_lock()
+ */
+ close(dfd);
+ dfd = -1;
+
mp = map_by_uuid(&map, info.uuid);
if (mp)
- mdfd = open_dev(mp->devnum);
+ mdfd = open_dev(mp->devnm);
else
mdfd = -1;
if (mdfd < 0)
goto out_unlock;
- sysfs_init(&info, mdfd, 0);
+ sysfs_init(&info, mdfd, NULL);
if (set_array_info(mdfd, st, &info) != 0) {
pr_err("failed to set array info for %s: %s\n",
dinfo.disk.major = major(stb.st_rdev);
dinfo.disk.minor = minor(stb.st_rdev);
if (add_disk(mdfd, st, &info, &dinfo) != 0) {
- pr_err("failed to add %s to %s: %s.\n",
+ pr_err("failed to add %s to new array %s: %s.\n",
devname, chosen_name, strerror(errno));
ioctl(mdfd, STOP_ARRAY, 0);
rv = 2;
goto out_unlock;
}
- sra = sysfs_read(mdfd, -1, (GET_DEVS | GET_STATE |
- GET_OFFSET | GET_SIZE));
+ sra = sysfs_read(mdfd, NULL, (GET_DEVS | GET_STATE |
+ GET_OFFSET | GET_SIZE));
if (!sra || !sra->devs || sra->devs->disk.raid_disk >= 0) {
/* It really should be 'none' - must be old buggy
}
info.array.working_disks = 1;
/* 6/ Make sure /var/run/mdadm.map contains this array. */
- map_update(&map, fd2devnum(mdfd),
+ map_update(&map, fd2devnm(mdfd),
info.text_version,
info.uuid, chosen_name);
} else {
struct supertype *st2;
struct mdinfo info2, *d;
- sra = sysfs_read(mdfd, -1, (GET_DEVS | GET_STATE |
+ sra = sysfs_read(mdfd, NULL, (GET_DEVS | GET_STATE |
GET_OFFSET | GET_SIZE));
if (mp->path)
strcpy(chosen_name, mp->path);
else
- strcpy(chosen_name, devnum2devname(mp->devnum));
+ strcpy(chosen_name, mp->devnm);
/* It is generally not OK to add non-spare drives to a
* running array as they are probably missing because
info.events, c->verbose, chosen_name);
err = add_disk(mdfd, st, sra, &info);
}
+ if (err < 0 && errno == EINVAL &&
+ info.disk.state & (1<<MD_DISK_SYNC)) {
+ /* Maybe it needs to be added as a spare */
+ if (policy_action_allows(policy, st->ss->name,
+ act_force_spare)) {
+ info.disk.state &= ~(1<<MD_DISK_SYNC);
+ err = add_disk(mdfd, st, sra, &info);
+ } else
+ if (c->verbose >= 0)
+ pr_err("can only add %s to %s as a spare, and force-spare is not set.\n",
+ devname, chosen_name);
+ }
if (err < 0) {
- pr_err("failed to add %s to %s: %s.\n",
+ pr_err("failed to add %s to existing array %s: %s.\n",
devname, chosen_name, strerror(errno));
rv = 2;
goto out_unlock;
/* 7/ Is there enough devices to possibly start the array? */
/* 7a/ if not, finish with success. */
if (info.array.level == LEVEL_CONTAINER) {
- int devnum = devnum; /* defined and used iff ->external */
+ char devnm[32];
/* Try to assemble within the container */
sysfs_uevent(sra, "change");
if (c->verbose >= 0)
info.array.working_disks == 1?"":"s");
wait_for(chosen_name, mdfd);
if (st->ss->external)
- devnum = fd2devnum(mdfd);
+ strcpy(devnm, fd2devnm(mdfd));
if (st->ss->load_container)
rv = st->ss->load_container(st, mdfd, NULL);
close(mdfd);
/* after spare is added, ping monitor for external metadata
* so that it can eg. try to rebuild degraded array */
if (st->ss->external)
- ping_monitor_by_id(devnum);
+ ping_monitor(devnm);
return rv;
}
* things change.
*/
sysfs_free(sra);
- sra = sysfs_read(mdfd, -1, (GET_DEVS | GET_STATE |
+ sra = sysfs_read(mdfd, NULL, (GET_DEVS | GET_STATE |
GET_OFFSET | GET_SIZE));
active_disks = count_active(st, sra, mdfd, &avail, &info);
if (enough(info.array.level, info.array.raid_disks,
if (c->runstop > 0 || active_disks >= info.array.working_disks) {
struct mdinfo *dsk;
/* Let's try to start it */
+
+ if (info.reshape_active && !(info.reshape_active & RESHAPE_NO_BACKUP)) {
+ fprintf(stderr, Name
+ ": %s: This array is being reshaped and cannot be started\n"
+ " by --incremental. Please use --assemble\n",
+ chosen_name);
+ goto out;
+ }
if (match && match->bitmap_file) {
int bmfd = open(match->bitmap_file, O_RDWR);
if (bmfd < 0) {
/* count how many devices in sra think they are active */
struct mdinfo *d;
int cnt = 0;
+ int replcnt = 0;
__u64 max_events = 0;
char *avail = NULL;
int *best = NULL;
best[info.disk.raid_disk] = devnum;
st->ss->getinfo_super(st, bestinfo, NULL);
}
- }
+ } else if (info.disk.state & (1<<MD_DISK_REPLACEMENT))
+ replcnt++;
st->ss->free_super(st);
}
if (!avail)
}
free(best);
free(devmap);
- return cnt;
+ return cnt + replcnt;
}
/* test if container has degraded member(s) */
int max_degraded = 0;
for(; map; map = map->next) {
- if (!is_subarray(map->metadata) ||
- devname2devnum(map->metadata+1) != me->devnum)
+ if (!metadata_container_matches(map->metadata, me->devnm))
continue;
- afd = open_dev(map->devnum);
+ afd = open_dev(map->devnm);
if (afd < 0)
continue;
/* most accurate information regarding array degradation */
}
free(st2);
}
- sra = sysfs_read(-1, mp->devnum,
+ 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->devnum,
+ sra = sysfs_read(-1, mp->devnm,
GET_DEVS|GET_OFFSET|GET_SIZE|GET_STATE|
GET_COMPONENT|GET_VERSION);
if (sra)
/* true for containers, here we must read superblock
* to obtain minimum spare size */
struct supertype *st3 = dup_super(st2);
- int mdfd = open_dev(mp->devnum);
+ int mdfd = open_dev(mp->devnm);
if (mdfd < 0) {
free(st3);
goto next;
close(mdfd);
}
if ((sra->component_size > 0 &&
- st2->ss->avail_size(st2, devsize) < sra->component_size)
+ st2->ss->avail_size(st2, devsize,
+ sra->devs
+ ? sra->devs->data_offset
+ : INVALID_SECTORS)
+ < sra->component_size)
||
(sra->component_size == 0 && devsize < component_size)) {
if (verbose > 1)
}
if (chosen) {
/* add current device to chosen array as a spare */
- int mdfd = open_dev(devname2devnum(chosen->sys_name));
+ int mdfd = open_dev(chosen->sys_name);
if (mdfd >= 0) {
struct mddev_dev devlist;
char devname[20];
mdu_array_info_t array;
mdu_bitmap_file_t bmf;
struct mdinfo *sra;
- int mdfd = open_dev(me->devnum);
+ int mdfd = open_dev(me->devnm);
if (mdfd < 0)
continue;
me->path, strerror(errno));
}
}
- sra = sysfs_read(mdfd, 0, 0);
+ /* FIXME check for reshape_active and consider not
+ * starting array.
+ */
+ sra = sysfs_read(mdfd, NULL, 0);
if (sra) {
if (sysfs_set_str(sra, NULL,
"array_state", "read-auto") == 0) {
if (verbose >= 0)
pr_err("started array %s\n",
- me->path ?: devnum2devname(me->devnum));
+ me->path ?: me->devnm);
} else {
pr_err("failed to start array %s: %s\n",
- me->path ?: devnum2devname(me->devnum),
+ me->path ?: me->devnm,
strerror(errno));
rv = 1;
}
if (devname[0] == '/') {
int fd = open(devname, O_RDONLY);
if (fd >= 0) {
- mdname = devnum2devname(fd2devnum(fd));
+ mdname = xstrdup(fd2devnm(fd));
close(fd);
}
} else {
return mdname;
mp = map_by_uuid(&map, uuid);
if (mp)
- mdname = devnum2devname(mp->devnum);
+ mdname = xstrdup(mp->devnm);
map_free(map);
}
mp = map_by_uuid(&map, ra->uuid);
if (mp) {
- mdfd = open_dev(mp->devnum);
+ mdfd = open_dev(mp->devnm);
if (mp->path)
strcpy(chosen_name, mp->path);
else
- strcpy(chosen_name, devnum2devname(mp->devnum));
+ strcpy(chosen_name, mp->devnm);
} else {
/* Check in mdadm.conf for container == devname and
"of any array\n", devname);
return 1;
}
- mdfd = open_dev(ent->devnum);
+ mdfd = open_dev(ent->devnm);
if (mdfd < 0) {
pr_err("Cannot open array %s!!\n", ent->dev);
free_mdstat(ent);
if (id_path) {
struct map_ent *map = NULL, *me;
- me = map_by_devnum(&map, ent->devnum);
+ me = map_by_devnm(&map, ent->devnm);
if (me)
policy_save_path(id_path, me);
map_free(map);
struct mdstat_ent *memb;
for (memb = mdstat ; memb ; memb = memb->next)
if (is_container_member(memb, ent->dev)) {
- int subfd = open_dev(memb->devnum);
+ int subfd = open_dev(memb->devnm);
if (subfd >= 0) {
Manage_subdevs(memb->dev, subfd,
&devlist, verbose, 0,
projects / thirdparty / mdadm.git / blobdiff