int verbose, int runstop, int autof,
int freeze_reshape);
-static struct mddev_ident *search_mdstat(struct supertype *st,
- struct mdinfo *info,
- char *devname,
- int verbose, int *rvp);
-
int Incremental(char *devname, int verbose, int runstop,
struct supertype *st, char *homehost, int require_homehost,
int autof, int freeze_reshape)
if (stat(devname, &stb) < 0) {
if (verbose >= 0)
- fprintf(stderr, Name ": stat failed for %s: %s.\n",
+ pr_err("stat failed for %s: %s.\n",
devname, strerror(errno));
return rv;
}
if ((stb.st_mode & S_IFMT) != S_IFBLK) {
if (verbose >= 0)
- fprintf(stderr, Name ": %s is not a block device.\n",
+ pr_err("%s is not a block device.\n",
devname);
return rv;
}
dfd = dev_open(devname, O_RDONLY|O_EXCL);
if (dfd < 0) {
if (verbose >= 0)
- fprintf(stderr, Name ": cannot open %s: %s.\n",
+ pr_err("cannot open %s: %s.\n",
devname, strerror(errno));
return rv;
}
close(dfd);
if (!rv && st->ss->container_content) {
if (map_lock(&map))
- fprintf(stderr, Name ": failed to get "
- "exclusive lock on mapfile\n");
+ pr_err("failed to get "
+ "exclusive lock on mapfile\n");
rv = Incremental_container(st, devname, homehost,
verbose, runstop, autof,
freeze_reshape);
return rv;
}
- fprintf(stderr, Name ": %s is not part of an md array.\n",
+ pr_err("%s is not part of an md array.\n",
devname);
return rv;
}
if (!conf_test_dev(devname)) {
if (verbose >= 0)
- fprintf(stderr, Name
- ": %s not permitted by mdadm.conf.\n",
- devname);
+ pr_err("%s not permitted by mdadm.conf.\n",
+ devname);
goto out;
}
if (fstat(dfd, &stb) < 0) {
if (verbose >= 0)
- fprintf(stderr, Name ": fstat failed for %s: %s.\n",
+ pr_err("fstat failed for %s: %s.\n",
devname, strerror(errno));
goto out;
}
if ((stb.st_mode & S_IFMT) != S_IFBLK) {
if (verbose >= 0)
- fprintf(stderr, Name ": %s is not a block device.\n",
+ pr_err("%s is not a block device.\n",
devname);
goto out;
}
if (st == NULL && (st = guess_super(dfd)) == NULL) {
if (verbose >= 0)
- fprintf(stderr, Name
- ": no recognisable superblock on %s.\n",
- devname);
+ pr_err("no recognisable superblock on %s.\n",
+ devname);
rv = try_spare(devname, &dfd, policy,
have_target ? &target_array : NULL,
st, verbose);
if (st->ss->compare_super == NULL ||
st->ss->load_super(st, dfd, NULL)) {
if (verbose >= 0)
- fprintf(stderr, Name ": no RAID superblock on %s.\n",
+ pr_err("no RAID superblock on %s.\n",
devname);
rv = try_spare(devname, &dfd, policy,
have_target ? &target_array : NULL,
st->ss->getinfo_super(st, &info, NULL);
/* 3/ Check if there is a match in mdadm.conf */
- match = search_mdstat(st, &info, devname, verbose, &rv);
+ match = conf_match(st, &info, devname, verbose, &rv);
if (!match && rv == 2)
goto out;
if (match && match->devname
&& strcasecmp(match->devname, "<ignore>") == 0) {
if (verbose >= 0)
- fprintf(stderr, Name ": array containing %s is explicitly"
+ pr_err("array containing %s is explicitly"
" ignored by mdadm.conf\n",
devname);
goto out;
if (!match && !conf_test_metadata(st->ss->name, policy,
(trustworthy == LOCAL))) {
if (verbose >= 1)
- fprintf(stderr, Name
- ": %s has metadata type %s for which "
- "auto-assembly is disabled\n",
- devname, st->ss->name);
+ pr_err("%s has metadata type %s for which "
+ "auto-assembly is disabled\n",
+ devname, st->ss->name);
goto out;
}
if (trustworthy == LOCAL_ANY)
name_to_use = info.name;
if (name_to_use[0] == 0 &&
- info.array.level == LEVEL_CONTAINER &&
- trustworthy == LOCAL) {
+ info.array.level == LEVEL_CONTAINER) {
name_to_use = info.text_version;
trustworthy = METADATA;
}
/* 4/ Check if array exists.
*/
if (map_lock(&map))
- fprintf(stderr, Name ": failed to get exclusive lock on "
+ pr_err("failed to get exclusive lock on "
"mapfile\n");
mp = map_by_uuid(&map, info.uuid);
if (mp)
name_to_use, autof, trustworthy, chosen_name);
if (mdfd < 0)
- goto out;
+ goto out_unlock;
sysfs_init(&info, mdfd, 0);
if (set_array_info(mdfd, st, &info) != 0) {
- fprintf(stderr, Name ": failed to set array info for %s: %s\n",
+ pr_err("failed to set array info for %s: %s\n",
chosen_name, strerror(errno));
rv = 2;
- goto out;
+ goto out_unlock;
}
dinfo = info;
dinfo.disk.major = major(stb.st_rdev);
dinfo.disk.minor = minor(stb.st_rdev);
if (add_disk(mdfd, st, &info, &dinfo) != 0) {
- fprintf(stderr, Name ": failed to add %s to %s: %s.\n",
+ pr_err("failed to add %s to %s: %s.\n",
devname, chosen_name, strerror(errno));
ioctl(mdfd, STOP_ARRAY, 0);
rv = 2;
- goto out;
+ goto out_unlock;
}
sra = sysfs_read(mdfd, -1, (GET_DEVS | GET_STATE |
GET_OFFSET | GET_SIZE));
* So reject it.
*/
ioctl(mdfd, STOP_ARRAY, NULL);
- fprintf(stderr, Name
- ": You have an old buggy kernel which cannot support\n"
- " --incremental reliably. Aborting.\n");
- sysfs_free(sra);
+ pr_err("You have an old buggy kernel which cannot support\n"
+ " --incremental reliably. Aborting.\n");
rv = 2;
- goto out;
+ goto out_unlock;
}
info.array.working_disks = 1;
/* 6/ Make sure /var/run/mdadm.map contains this array. */
act_re_add)
&& runstop < 1) {
if (ioctl(mdfd, GET_ARRAY_INFO, &ainf) == 0) {
- fprintf(stderr, Name
- ": not adding %s to active array (without --run) %s\n",
- devname, chosen_name);
+ pr_err("not adding %s to active array (without --run) %s\n",
+ devname, chosen_name);
rv = 2;
- goto out;
+ goto out_unlock;
}
}
if (!sra) {
rv = 2;
- goto out;
+ goto out_unlock;
}
if (sra->devs) {
sprintf(dn, "%d:%d", sra->devs->disk.major,
sra->devs->disk.minor);
dfd2 = dev_open(dn, O_RDONLY);
+ if (dfd2 < 0) {
+ pr_err("unable to open %s\n", devname);
+ rv = 2;
+ goto out_unlock;
+ }
st2 = dup_super(st);
if (st2->ss->load_super(st2, dfd2, NULL) ||
st->ss->compare_super(st, st2) != 0) {
- fprintf(stderr, Name
- ": metadata mismatch between %s and "
- "chosen array %s\n",
- devname, chosen_name);
+ pr_err("metadata mismatch between %s and "
+ "chosen array %s\n",
+ devname, chosen_name);
close(dfd2);
rv = 2;
- goto out;
+ goto out_unlock;
}
close(dfd2);
st2->ss->getinfo_super(st2, &info2, NULL);
if (info.array.level != info2.array.level ||
memcmp(info.uuid, info2.uuid, 16) != 0 ||
info.array.raid_disks != info2.array.raid_disks) {
- fprintf(stderr, Name
- ": unexpected difference between %s and %s.\n",
- chosen_name, devname);
+ pr_err("unexpected difference between %s and %s.\n",
+ chosen_name, devname);
rv = 2;
- goto out;
+ goto out_unlock;
}
}
- info2.disk.major = major(stb.st_rdev);
- info2.disk.minor = minor(stb.st_rdev);
+ info.disk.major = major(stb.st_rdev);
+ info.disk.minor = minor(stb.st_rdev);
/* add disk needs to know about containers */
if (st->ss->external)
sra->array.level = LEVEL_CONTAINER;
- err = add_disk(mdfd, st, sra, &info2);
+ err = add_disk(mdfd, st, sra, &info);
if (err < 0 && errno == EBUSY) {
/* could be another device present with the same
* disk.number. Find and reject any such
*/
find_reject(mdfd, st, sra, info.disk.number,
info.events, verbose, chosen_name);
- err = add_disk(mdfd, st, sra, &info2);
+ err = add_disk(mdfd, st, sra, &info);
}
if (err < 0) {
- fprintf(stderr, Name ": failed to add %s to %s: %s.\n",
+ pr_err("failed to add %s to %s: %s.\n",
devname, chosen_name, strerror(errno));
rv = 2;
- goto out;
+ goto out_unlock;
}
info.array.working_disks = 0;
for (d = sra->devs; d; d=d->next)
if (info.array.level == LEVEL_CONTAINER) {
int devnum = devnum; /* defined and used iff ->external */
/* Try to assemble within the container */
- sysfs_uevent(&info, "change");
+ sysfs_uevent(sra, "change");
if (verbose >= 0)
- fprintf(stderr, Name
- ": container %s now has %d devices\n",
- chosen_name, info.array.working_disks);
+ pr_err("container %s now has %d device%s\n",
+ chosen_name, info.array.working_disks,
+ info.array.working_disks==1?"":"s");
wait_for(chosen_name, mdfd);
if (st->ss->external)
devnum = fd2devnum(mdfd);
active_disks = count_active(st, sra, mdfd, &avail, &info);
if (enough(info.array.level, info.array.raid_disks,
info.array.layout, info.array.state & 1,
- avail, active_disks) == 0) {
+ avail) == 0) {
if (verbose >= 0)
- fprintf(stderr, Name
- ": %s attached to %s, not enough to start (%d).\n",
- devname, chosen_name, active_disks);
- map_unlock(&map);
+ pr_err("%s attached to %s, not enough to start (%d).\n",
+ devname, chosen_name, active_disks);
rv = 0;
- goto out;
+ goto out_unlock;
}
/* 7b/ if yes, */
if (ioctl(mdfd, GET_ARRAY_INFO, &ainf) == 0) {
if (verbose >= 0)
- fprintf(stderr, Name
- ": %s attached to %s which is already active.\n",
- devname, chosen_name);
- map_unlock(&map);
+ pr_err("%s attached to %s which is already active.\n",
+ devname, chosen_name);
rv = 0;
- goto out;
+ goto out_unlock;
}
map_unlock(&map);
if (match && match->bitmap_file) {
int bmfd = open(match->bitmap_file, O_RDWR);
if (bmfd < 0) {
- fprintf(stderr, Name
- ": Could not open bitmap file %s.\n",
- match->bitmap_file);
+ pr_err("Could not open bitmap file %s.\n",
+ match->bitmap_file);
goto out;
}
if (ioctl(mdfd, SET_BITMAP_FILE, bmfd) != 0) {
close(bmfd);
- fprintf(stderr, Name
- ": Failed to set bitmapfile for %s.\n",
- chosen_name);
+ pr_err("Failed to set bitmapfile for %s.\n",
+ chosen_name);
goto out;
}
close(bmfd);
"array_state", "read-auto");
if (rv == 0) {
if (verbose >= 0)
- fprintf(stderr, Name
- ": %s attached to %s, which has been started.\n",
- devname, chosen_name);
+ pr_err("%s attached to %s, which has been started.\n",
+ devname, chosen_name);
rv = 0;
wait_for(chosen_name, mdfd);
/* We just started the array, so some devices
for (dsk = sra->devs; dsk ; dsk = dsk->next) {
if (disk_action_allows(dsk, st->ss->name, act_re_add) &&
add_disk(mdfd, st, sra, dsk) == 0)
- fprintf(stderr, Name
- ": %s re-added to %s\n",
- dsk->sys_name, chosen_name);
+ pr_err("%s re-added to %s\n",
+ dsk->sys_name, chosen_name);
}
} else {
- fprintf(stderr, Name
- ": %s attached to %s, but failed to start: %s.\n",
- devname, chosen_name, strerror(errno));
+ pr_err("%s attached to %s, but failed to start: %s.\n",
+ devname, chosen_name, strerror(errno));
rv = 1;
}
} else {
if (verbose >= 0)
- fprintf(stderr, Name
- ": %s attached to %s, not enough to start safely.\n",
- devname, chosen_name);
+ pr_err("%s attached to %s, not enough to start safely.\n",
+ devname, chosen_name);
rv = 0;
}
out:
if (sra)
sysfs_free(sra);
return rv;
-}
-
-static struct mddev_ident *search_mdstat(struct supertype *st,
- struct mdinfo *info,
- char *devname,
- int verbose, int *rvp)
-{
- struct mddev_ident *array_list, *match;
- array_list = conf_get_ident(NULL);
- match = NULL;
- for (; array_list; array_list = array_list->next) {
- if (array_list->uuid_set &&
- same_uuid(array_list->uuid, info->uuid, st->ss->swapuuid)
- == 0) {
- if (verbose >= 2 && array_list->devname)
- fprintf(stderr, Name
- ": UUID differs from %s.\n",
- array_list->devname);
- continue;
- }
- if (array_list->name[0] &&
- strcasecmp(array_list->name, info->name) != 0) {
- if (verbose >= 2 && array_list->devname)
- fprintf(stderr, Name
- ": Name differs from %s.\n",
- array_list->devname);
- continue;
- }
- if (array_list->devices &&
- !match_oneof(array_list->devices, devname)) {
- if (verbose >= 2 && array_list->devname)
- fprintf(stderr, Name
- ": Not a listed device for %s.\n",
- array_list->devname);
- continue;
- }
- if (array_list->super_minor != UnSet &&
- array_list->super_minor != info->array.md_minor) {
- if (verbose >= 2 && array_list->devname)
- fprintf(stderr, Name
- ": Different super-minor to %s.\n",
- array_list->devname);
- continue;
- }
- if (!array_list->uuid_set &&
- !array_list->name[0] &&
- !array_list->devices &&
- array_list->super_minor == UnSet) {
- if (verbose >= 2 && array_list->devname)
- fprintf(stderr, Name
- ": %s doesn't have any identifying information.\n",
- array_list->devname);
- continue;
- }
- /* FIXME, should I check raid_disks and level too?? */
-
- if (match) {
- if (verbose >= 0) {
- if (match->devname && array_list->devname)
- fprintf(stderr, Name
- ": we match both %s and %s - cannot decide which to use.\n",
- match->devname, array_list->devname);
- else
- fprintf(stderr, Name
- ": multiple lines in mdadm.conf match\n");
- }
- *rvp = 2;
- match = NULL;
- break;
- }
- match = array_list;
- }
- return match;
+out_unlock:
+ map_unlock(&map);
+ goto out;
}
static void find_reject(int mdfd, struct supertype *st, struct mdinfo *sra,
sysfs_set_str(sra, d, "slot", "none");
if (sysfs_set_str(sra, d, "state", "remove") == 0)
if (verbose >= 0)
- fprintf(stderr, Name
- ": removing old device %s from %s\n",
- d->sys_name+4, array_name);
+ pr_err("removing old device %s from %s\n",
+ d->sys_name+4, array_name);
}
}
st->ss->getinfo_super(st, &info, devmap + raid_disks * devnum);
if (!avail) {
raid_disks = info.array.raid_disks;
- avail = calloc(raid_disks, 1);
- if (!avail) {
- fprintf(stderr, Name ": out of memory.\n");
- exit(1);
- }
+ avail = xcalloc(raid_disks, 1);
*availp = avail;
- best = calloc(raid_disks, sizeof(int));
- devmap = calloc(raid_disks * numdevs, 1);
+ best = xcalloc(raid_disks, sizeof(int));
+ devmap = xcalloc(raid_disks, numdevs);
st->ss->getinfo_super(st, &info, devmap);
}
*/
if (map_lock(&map)) {
- fprintf(stderr, Name ": failed to get exclusive lock on "
+ pr_err("failed to get exclusive lock on "
"mapfile\n");
return 1;
}
(st->minor_version >= 0 &&
st->minor_version != st2->minor_version)) {
if (verbose > 1)
- fprintf(stderr, Name ": not adding %s to %s as metadata type doesn't match\n",
+ pr_err("not adding %s to %s as metadata type doesn't match\n",
devname, mp->path);
free(st2);
continue;
sra->text_version);
if (!st2) {
if (verbose > 1)
- fprintf(stderr, Name ": not adding %s to %s"
+ pr_err("not adding %s to %s"
" as metadata not recognised.\n",
devname, mp->path);
goto next;
* to obtain minimum spare size */
struct supertype *st3 = dup_super(st2);
int mdfd = open_dev(mp->devnum);
- if (!mdfd)
+ if (mdfd < 0) {
+ free(st3);
goto next;
+ }
if (st3->ss->load_container &&
!st3->ss->load_container(st3, mdfd, mp->path)) {
component_size = st3->ss->min_acceptable_spare_size(st3);
||
(sra->component_size == 0 && devsize < component_size)) {
if (verbose > 1)
- fprintf(stderr, Name ": not adding %s to %s as it is too small\n",
+ pr_err("not adding %s to %s as it is too small\n",
devname, mp->path);
goto next;
}
if (domain_test(dl, pol, st2->ss->name) != 1) {
/* domain test fails */
if (verbose > 1)
- fprintf(stderr, Name ": not adding %s to %s as"
+ pr_err("not adding %s to %s as"
" it is not in a compatible domain\n",
devname, mp->path);
char devname[20];
devlist.next = NULL;
devlist.used = 0;
- devlist.re_add = 0;
devlist.writemostly = 0;
devlist.devname = devname;
sprintf(devname, "%d:%d", major(stb.st_rdev),
}
if (verbose > 0) {
if (rv == 0)
- fprintf(stderr, Name ": added %s as spare for %s\n",
+ pr_err("added %s as spare for %s\n",
devname, chosen->sys_name);
else
- fprintf(stderr, Name ": failed to add %s as spare for %s\n",
+ pr_err("failed to add %s as spare for %s\n",
devname, chosen->sys_name);
}
sysfs_free(chosen);
}
+ map_unlock(&map);
return rv;
}
close(fd);
}
+ closedir(dir);
+
if (!chosen)
return 1;
!policy_action_allows(pol, st?st->ss->name:NULL,
act_spare_same_slot)) {
if (verbose > 1)
- fprintf(stderr, Name ": %s is not bare, so not "
+ pr_err("%s is not bare, so not "
"considering as a spare\n",
devname);
return 1;
}
if (verbose >= 0) {
if (added == 0)
- fprintf(stderr, Name
- ": Added bitmap %s to %s\n",
- mddev->bitmap_file, me->path);
+ pr_err("Added bitmap %s to %s\n",
+ mddev->bitmap_file, me->path);
else if (errno != EEXIST)
- fprintf(stderr, Name
- ": Failed to add bitmap to %s: %s\n",
- me->path, strerror(errno));
+ pr_err("Failed to add bitmap to %s: %s\n",
+ me->path, strerror(errno));
}
}
sra = sysfs_read(mdfd, 0, 0);
if (sysfs_set_str(sra, NULL,
"array_state", "read-auto") == 0) {
if (verbose >= 0)
- fprintf(stderr, Name
- ": started array %s\n",
- me->path ?: devnum2devname(me->devnum));
+ pr_err("started array %s\n",
+ me->path ?: devnum2devname(me->devnum));
} else {
- fprintf(stderr, Name
- ": failed to start array %s: %s\n",
- me->path ?: devnum2devname(me->devnum),
- strerror(errno));
+ pr_err("failed to start array %s: %s\n",
+ me->path ?: devnum2devname(me->devnum),
+ strerror(errno));
rv = 1;
}
+ sysfs_free(sra);
}
}
return rv;
struct map_ent *smp;
int suuid[4];
int sfd;
+ int ra_blocked = 0;
+ int ra_all = 0;
st->ss->getinfo_super(st, &info, NULL);
/* pass */;
else {
if (verbose)
- fprintf(stderr, Name ": not enough devices to start the container\n");
+ pr_err("not enough devices to start the container\n");
return 0;
}
- match = search_mdstat(st, &info, devname, verbose, &rv);
+ match = conf_match(st, &info, devname, verbose, &rv);
if (match == NULL && rv == 2)
return rv;
trustworthy = FOREIGN;
list = st->ss->container_content(st, NULL);
- /* do not assemble arrays that might have bad blocks */
- if (list && list->array.state & (1<<MD_SB_BBM_ERRORS)) {
- fprintf(stderr, Name ": BBM log found in metadata. "
- "Cannot activate array(s).\n");
- /* free container data and exit */
- sysfs_free(list);
- return 2;
- }
-
+ /* when nothing to activate - quit */
+ if (list == NULL)
+ return 0;
for (ra = list ; ra ; ra = ra->next) {
int mdfd;
char chosen_name[1024];
struct map_ent *mp;
struct mddev_ident *match = NULL;
+ ra_all++;
+ /* do not activate arrays blocked by metadata handler */
+ if (ra->array.state & (1 << MD_SB_BLOCK_VOLUME)) {
+ pr_err("Cannot activate array %s in %s.\n",
+ ra->text_version, devname);
+ ra_blocked++;
+ continue;
+ }
mp = map_by_uuid(&map, ra->uuid);
if (mp) {
/* we have a match */
match = array_list;
if (verbose>0)
- fprintf(stderr, Name ": match found for member %s\n",
+ pr_err("match found for member %s\n",
array_list->member);
break;
}
if (match && match->devname &&
strcasecmp(match->devname, "<ignore>") == 0) {
if (verbose > 0)
- fprintf(stderr, Name ": array %s/%s is "
- "explicitly ignored by mdadm.conf\n",
- match->container, match->member);
+ pr_err("array %s/%s is "
+ "explicitly ignored by mdadm.conf\n",
+ match->container, match->member);
return 2;
}
if (match)
}
if (mdfd < 0) {
- fprintf(stderr, Name ": failed to open %s: %s.\n",
+ pr_err("failed to open %s: %s.\n",
chosen_name, strerror(errno));
return 2;
}
close(mdfd);
}
+ /* don't move spares to container with volume being activated
+ when all volumes are blocked */
+ if (ra_all == ra_blocked)
+ return 0;
+
/* Now move all suitable spares from spare container */
domains = domain_from_array(list, st->ss->name);
memcpy(suuid, uuid_zero, sizeof(int[4]));
disks = disks->next;
}
if (count)
- fprintf(stderr, Name
- ": Added %d spare%s to %s\n",
- count, count>1?"s":"", devname);
+ pr_err("Added %d spare%s to %s\n",
+ count, count>1?"s":"", devname);
}
sysfs_free(sinfo);
} else
"port\n");
if (strchr(devname, '/')) {
- fprintf(stderr, Name ": incremental removal requires a "
+ pr_err("incremental removal requires a "
"kernel device name, not a file: %s\n", devname);
return 1;
}
ent = mdstat_by_component(devname);
if (!ent) {
- fprintf(stderr, Name ": %s does not appear to be a component "
+ pr_err("%s does not appear to be a component "
"of any array\n", devname);
return 1;
}
mdfd = open_dev(ent->devnum);
if (mdfd < 0) {
- fprintf(stderr, Name ": Cannot open array %s!!\n", ent->dev);
+ pr_err("Cannot open array %s!!\n", ent->dev);
free_mdstat(ent);
return 1;
}
projects / thirdparty / mdadm.git / blobdiff