/*
* mdadm - manage Linux "md" devices aka RAID arrays.
*
- * Copyright (C) 2001-2012 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2001-2013 Neil Brown <neilb@suse.de>
*
*
* This program is free software; you can redistribute it and/or modify
info.array.active_disks = 0;
info.array.working_disks = 0;
dnum = 0;
+ for (dv = devlist; dv ; dv = dv->next)
+ if (data_offset == VARIABLE_OFFSET)
+ dv->data_offset = INVALID_SECTORS;
+ else
+ dv->data_offset = data_offset;
+
for (dv=devlist; dv && !have_container; dv=dv->next, dnum++) {
char *dname = dv->devname;
unsigned long long freesize;
missing_disks ++;
continue;
}
- if (data_offset != VARIABLE_OFFSET) {
+ if (data_offset == VARIABLE_OFFSET) {
doff = strchr(dname, ':');
if (doff) {
*doff++ = 0;
do_default_chunk = 0;
}
}
+ if (!freesize) {
+ pr_err("no free space left on %s\n", dname);
+ fail = 1;
+ continue;
+ }
if (s->size && freesize < s->size) {
pr_err("%s is smaller than given size."
pr_err("size set to %lluK\n", s->size);
}
}
+
+ if (!s->bitmap_file &&
+ s->level >= 1 &&
+ st->ss->add_internal_bitmap &&
+ (s->write_behind || s->size > 100*1024*1024ULL)) {
+ if (c->verbose > 0)
+ pr_err("automatically enabling write-intent bitmap on large array\n");
+ s->bitmap_file = "internal";
+ }
+ if (s->bitmap_file && strcmp(s->bitmap_file, "none") == 0)
+ s->bitmap_file = NULL;
+
if (!have_container && s->level > 0 && ((maxsize-s->size)*100 > maxsize)) {
if (c->runstop != 1 || c->verbose >= 0)
pr_err("largest drive (%s) exceeds size (%lluK) by more than 1%%\n",
* including spares
* failed_disks is the number of disks marked failed
*
- * Ideally, the kernel would keep these (except raid_disks)
+ * Ideally, the kernel would keep these (except raid_disks)
* up-to-date as we ADD_NEW_DISK, but it doesn't (yet).
* So for now, we assume that all raid and spare
* devices will be given.
/* base name on mddev */
/* /dev/md0 -> 0
* /dev/md_d0 -> d0
+ * /dev/md_foo -> foo
* /dev/md/1 -> 1
* /dev/md/d1 -> d1
* /dev/md/home -> home
name = strrchr(mddev, '/');
if (name) {
name++;
- if (strncmp(name, "md_d", 4)==0 &&
- strlen(name) > 4 &&
- isdigit(name[4]) &&
+ if (strncmp(name, "md_", 3)==0 &&
+ strlen(name) > 3 &&
(name-mddev) == 5 /* /dev/ */)
name += 3;
else if (strncmp(name, "md", 2)==0 &&
total_slots = info.array.nr_disks;
st->ss->getinfo_super(st, &info, NULL);
- sysfs_init(&info, mdfd, 0);
+ sysfs_init(&info, mdfd, NULL);
if (did_default && c->verbose >= 0) {
if (is_subarray(info.text_version)) {
- int dnum = devname2devnum(info.text_version+1);
- char *path;
- int mdp = get_mdp_major();
+ char devnm[32];
+ char *ep;
struct mdinfo *mdi;
- if (dnum > 0)
- path = map_dev(MD_MAJOR, dnum, 1);
- else
- path = map_dev(mdp, (-1-dnum)<< 6, 1);
- mdi = sysfs_read(-1, dnum, GET_VERSION);
+ strncpy(devnm, info.text_version+1, 32);
+ devnm[31] = 0;
+ ep = strchr(devnm, '/');
+ if (ep)
+ *ep = 0;
+
+ mdi = sysfs_read(-1, devnm, GET_VERSION);
- pr_err("Creating array inside "
- "%s container %s\n",
- mdi?mdi->text_version:"managed", path);
+ pr_err("Creating array inside %s container %s\n",
+ mdi?mdi->text_version:"managed", devnm);
sysfs_free(mdi);
} else
pr_err("Defaulting to version"
" %s metadata\n", info.text_version);
}
- map_update(&map, fd2devnum(mdfd), info.text_version,
+ map_update(&map, fd2devnm(mdfd), info.text_version,
info.uuid, chosen_name);
- map_unlock(&map);
+ /* Keep map locked until devices have been added to array
+ * to stop another mdadm from finding and using those devices.
+ */
if (s->bitmap_file && vers < 9003) {
major_num = BITMAP_MAJOR_HOSTENDIAN;
if (s->bitmap_file && strcmp(s->bitmap_file, "internal")==0) {
if ((vers%100) < 2) {
pr_err("internal bitmaps not supported by this kernel.\n");
- goto abort;
+ goto abort_locked;
}
if (!st->ss->add_internal_bitmap) {
pr_err("internal bitmaps not supported with %s metadata\n",
st->ss->name);
- goto abort;
+ goto abort_locked;
}
if (!st->ss->add_internal_bitmap(st, &s->bitmap_chunk,
c->delay, s->write_behind,
bitmapsize, 1, major_num)) {
pr_err("Given bitmap chunk size not supported.\n");
- goto abort;
+ goto abort_locked;
}
s->bitmap_file = NULL;
}
- sysfs_init(&info, mdfd, 0);
+ sysfs_init(&info, mdfd, NULL);
- if (st->ss->external && st->container_dev != NoMdDev) {
+ if (st->ss->external && st->container_devnm[0]) {
/* member */
/* When creating a member, we need to be careful
*
* For now, fail if it is already running.
*/
- container_fd = open_dev_excl(st->container_dev);
+ container_fd = open_dev_excl(st->container_devnm);
if (container_fd < 0) {
pr_err("Cannot get exclusive "
"open on container - weird.\n");
- goto abort;
+ goto abort_locked;
}
- if (mdmon_running(st->container_dev)) {
+ if (mdmon_running(st->container_devnm)) {
if (c->verbose)
pr_err("reusing mdmon "
"for %s.\n",
- devnum2devname(st->container_dev));
+ st->container_devnm);
st->update_tail = &st->updates;
} else
need_mdmon = 1;
if (rv) {
pr_err("failed to set array info for %s: %s\n",
mddev, strerror(errno));
- goto abort;
+ goto abort_locked;
}
if (s->bitmap_file) {
c->delay, s->write_behind,
bitmapsize,
major_num)) {
- goto abort;
+ goto abort_locked;
}
bitmap_fd = open(s->bitmap_file, O_RDWR);
if (bitmap_fd < 0) {
pr_err("weird: %s cannot be openned\n",
s->bitmap_file);
- goto abort;
+ goto abort_locked;
}
if (ioctl(mdfd, SET_BITMAP_FILE, bitmap_fd) < 0) {
pr_err("Cannot set bitmap file for %s: %s\n",
mddev, strerror(errno));
- goto abort;
+ goto abort_locked;
}
}
infos = xmalloc(sizeof(*infos) * total_slots);
-
+ enable_fds(total_slots);
for (pass=1; pass <=2 ; pass++) {
struct mddev_dev *moved_disk = NULL; /* the disk that was moved out of the insert point */
fd = -1;
else {
if (st->ss->external &&
- st->container_dev != NoMdDev)
+ st->container_devnm[0])
fd = open(dv->devname, O_RDWR);
else
fd = open(dv->devname, O_RDWR|O_EXCL);
pr_err("failed to open %s "
"after earlier success - aborting\n",
dv->devname);
- goto abort;
+ goto abort_locked;
}
fstat(fd, &stb);
inf->disk.major = major(stb.st_rdev);
fd, dv->devname,
dv->data_offset)) {
ioctl(mdfd, STOP_ARRAY, NULL);
- goto abort;
+ goto abort_locked;
}
st->ss->getinfo_super(st, inf, NULL);
safe_mode_delay = inf->safe_mode_delay;
pr_err("ADD_NEW_DISK for %s "
"failed: %s\n",
dv->devname, strerror(errno));
- goto abort;
+ goto abort_locked;
}
break;
}
* the subarray cursor such that ->getinfo_super once
* again returns container info.
*/
- map_lock(&map);
st->ss->getinfo_super(st, &info_new, NULL);
if (st->ss->external && s->level != LEVEL_CONTAINER &&
!same_uuid(info_new.uuid, info.uuid, 0)) {
- map_update(&map, fd2devnum(mdfd),
+ map_update(&map, fd2devnm(mdfd),
info_new.text_version,
info_new.uuid, chosen_name);
- me = map_by_devnum(&map, st->container_dev);
+ me = map_by_devnm(&map, st->container_devnm);
}
if (st->ss->write_init_super(st)) {
char *path = xstrdup(me->path);
st->ss->getinfo_super(st, &info_new, NULL);
- map_update(&map, st->container_dev,
+ map_update(&map, st->container_devnm,
info_new.text_version,
info_new.uuid, path);
free(path);
}
- map_unlock(&map);
flush_metadata_updates(st);
st->ss->free_super(st);
}
}
+ map_unlock(&map);
free(infos);
if (s->level == LEVEL_CONTAINER) {
ioctl(mdfd, STOP_ARRAY, NULL);
goto abort;
}
+ /* if start_ro module parameter is set, array is
+ * auto-read-only, which is bad as the resync won't
+ * start. So lets make it read-write now.
+ */
+ ioctl(mdfd, RESTART_ARRAY_RW, NULL);
}
if (c->verbose >= 0)
pr_err("array %s started.\n", mddev);
- if (st->ss->external && st->container_dev != NoMdDev) {
+ if (st->ss->external && st->container_devnm[0]) {
if (need_mdmon)
- start_mdmon(st->container_dev);
+ start_mdmon(st->container_devnm);
- ping_monitor_by_id(st->container_dev);
+ ping_monitor(st->container_devnm);
close(container_fd);
}
wait_for(chosen_name, mdfd);
abort:
map_lock(&map);
abort_locked:
- map_remove(&map, fd2devnum(mdfd));
+ map_remove(&map, fd2devnm(mdfd));
map_unlock(&map);
if (mdfd >= 0)
projects / thirdparty / mdadm.git / blobdiff