struct state {
char *devname;
- int devnum; /* to sync with mdstat info */
+ char devnm[32]; /* to sync with mdstat info */
long utime;
int err;
char *spare_group;
int devstate[MAX_DISKS];
dev_t devid[MAX_DISKS];
int percent;
- int parent_dev; /* For subarray, devnum of parent.
- * For others, NoMdDev
- */
+ char parent_devnm[32]; /* For subarray, devnm of parent.
+ * For others, ""
+ */
struct supertype *metadata;
struct state *subarray;/* for a container it is a link to first subarray
* for a subarray it is a link to next subarray
return rv;
}
- if (share)
+ if (share)
if (check_one_sharer(c->scan))
return 1;
mdlist->devname);
}
st->next = statelist;
- st->devnum = INT_MAX;
+ st->devnm[0] = 0;
st->percent = RESYNC_UNKNOWN;
st->from_config = 1;
st->expected_spares = mdlist->spare_disks;
struct state *st = xcalloc(1, sizeof *st);
st->devname = xstrdup(dv->devname);
st->next = statelist;
- st->devnum = INT_MAX;
+ st->devnm[0] = 0;
st->percent = RESYNC_UNKNOWN;
st->expected_spares = -1;
if (mdlist) {
}
}
-
while (! finished) {
int new_found = 0;
struct state *st;
if (check_array(st, mdstat, c->test, &info,
increments, c->prefer))
anydegraded = 1;
-
+
/* now check if there are any new devices found in mdstat */
if (c->scan)
new_found = add_new_arrays(mdstat, &statelist, c->test,
close(fd);
return 0;
}
- if (st->devnum == INT_MAX) {
- struct stat stb;
- if (fstat(fd, &stb) == 0 &&
- (S_IFMT&stb.st_mode)==S_IFBLK) {
- if (major(stb.st_rdev) == MD_MAJOR)
- st->devnum = minor(stb.st_rdev);
- else
- st->devnum = -1- (minor(stb.st_rdev)>>6);
- }
- }
+ if (st->devnm[0] == 0)
+ strcpy(st->devnm, fd2devnm(fd));
for (mse2 = mdstat ; mse2 ; mse2=mse2->next)
- if (mse2->devnum == st->devnum) {
- mse2->devnum = INT_MAX; /* flag it as "used" */
+ if (strcmp(mse2->devnm, st->devnm) == 0) {
+ mse2->devnm[0] = 0; /* flag it as "used" */
mse = mse2;
}
* we should report that.
*/
struct mdinfo *sra =
- sysfs_read(-1, st->devnum, GET_MISMATCH);
+ sysfs_read(-1, st->devnm, GET_MISMATCH);
if (sra && sra->mismatch_cnt > 0) {
char cnt[80];
snprintf(cnt, sizeof(cnt),
if (mse->metadata_version &&
strncmp(mse->metadata_version, "external:", 9) == 0 &&
- is_subarray(mse->metadata_version+9))
- st->parent_dev =
- devname2devnum(mse->metadata_version+10);
- else
- st->parent_dev = NoMdDev;
+ is_subarray(mse->metadata_version+9)) {
+ char *sl;
+ strcpy(st->parent_devnm,
+ mse->metadata_version+10);
+ sl = strchr(st->parent_devnm, '/');
+ if (sl)
+ *sl = 0;
+ } else
+ st->parent_devnm[0] = 0;
if (st->metadata == NULL &&
- st->parent_dev == NoMdDev)
+ st->parent_devnm[0] == 0)
st->metadata = super_by_fd(fd, NULL);
close(fd);
int new_found = 0;
for (mse=mdstat; mse; mse=mse->next)
- if (mse->devnum != INT_MAX &&
+ if (mse->devnm[0] &&
(!mse->level || /* retrieve containers */
(strcmp(mse->level, "raid0") != 0 &&
strcmp(mse->level, "linear") != 0))
struct state *st = xcalloc(1, sizeof *st);
mdu_array_info_t array;
int fd;
- st->devname = xstrdup(get_md_name(mse->devnum));
+ st->devname = xstrdup(get_md_name(mse->devnm));
if ((fd = open(st->devname, O_RDONLY)) < 0 ||
ioctl(fd, GET_ARRAY_INFO, &array)< 0) {
/* no such array */
close(fd);
st->next = *statelist;
st->err = 1;
- st->devnum = mse->devnum;
+ strcpy(st->devnm, mse->devnm);
st->percent = RESYNC_UNKNOWN;
st->expected_spares = -1;
if (mse->metadata_version &&
strncmp(mse->metadata_version, "external:", 9) == 0 &&
- is_subarray(mse->metadata_version+9))
- st->parent_dev =
- devname2devnum(mse->metadata_version+10);
- else
- st->parent_dev = NoMdDev;
+ is_subarray(mse->metadata_version+9)) {
+ char *sl;
+ strcpy(st->parent_devnm,
+ mse->metadata_version+10);
+ sl = strchr(st->parent_devnm, '/');
+ *sl = 0;
+ } else
+ st->parent_devnm[0] = 0;
*statelist = st;
if (test)
alert("TestMessage", st->devname, NULL, info);
dev_size < min_size)
continue;
- pol = devnum_policy(from->devid[d]);
+ pol = devid_policy(from->devid[d]);
if (from->spare_group)
pol_add(&pol, pol_domain,
from->spare_group, NULL);
close(fd);
return 0;
}
-
+
err = st->ss->load_container(st, fd, NULL);
close(fd);
if (err)
return 0;
-
+
if (from == to) {
/* We must check if number of active disks has not increased
* since ioctl in main loop. mdmon may have added spare
return dev;
}
-
static void try_spare_migration(struct state *statelist, struct alert_info *info)
{
struct state *from;
struct state *to = st;
unsigned long long min_size;
- if (to->parent_dev != NoMdDev && !to->parent)
+ if (to->parent_devnm[0] && !to->parent)
/* subarray monitored without parent container
* we can't move spares here */
continue;
-
+
if (to->parent)
/* member of a container */
to = to->parent;
st->subarray = NULL;
}
for (st = list; st; st = st->next)
- if (st->parent_dev != NoMdDev)
+ if (st->parent_devnm[0])
for (cont = list; cont; cont = cont->next)
if (!cont->err &&
- cont->parent_dev == NoMdDev &&
- cont->devnum == st->parent_dev) {
+ cont->parent_devnm[0] == 0 &&
+ strcmp(cont->devnm, st->parent_devnm) == 0) {
st->parent = cont;
st->subarray = cont->subarray;
cont->subarray = st;
int Wait(char *dev)
{
struct stat stb;
- int devnum;
+ char devnm[32];
int rv = 1;
if (stat(dev, &stb) != 0) {
strerror(errno));
return 2;
}
- devnum = stat2devnum(&stb);
+ strcpy(devnm, stat2devnm(&stb));
while(1) {
struct mdstat_ent *ms = mdstat_read(1, 0);
struct mdstat_ent *e;
for (e=ms ; e; e=e->next)
- if (e->devnum == devnum)
+ if (strcmp(e->devnm, devnm) == 0)
break;
+ if (e->percent == RESYNC_NONE) {
+ /* We could be in the brief pause before something
+ * starts. /proc/mdstat doesn't show that, but
+ * sync_action does.
+ */
+ struct mdinfo mdi;
+ char buf[21];
+ sysfs_init(&mdi, -1, devnm);
+ if (sysfs_get_str(&mdi, NULL, "sync_action",
+ buf, 20) > 0 &&
+ strcmp(buf,"idle\n") != 0)
+ e->percent = RESYNC_UNKNOWN;
+ }
if (!e || e->percent == RESYNC_NONE) {
if (e && e->metadata_version &&
strncmp(e->metadata_version, "external:", 9) == 0) {
if (is_subarray(&e->metadata_version[9]))
ping_monitor(&e->metadata_version[9]);
else
- ping_monitor_by_id(devnum);
+ ping_monitor(devnm);
}
free_mdstat(ms);
return rv;
int fd;
struct mdinfo *mdi;
int rv = 1;
- int devnum;
+ char devnm[32];
fd = open(dev, O_RDONLY);
if (fd < 0) {
return 1;
}
- devnum = fd2devnum(fd);
- mdi = sysfs_read(fd, devnum, GET_VERSION|GET_LEVEL|GET_SAFEMODE);
+ strcpy(devnm, fd2devnm(fd));
+ mdi = sysfs_read(fd, devnm, GET_VERSION|GET_LEVEL|GET_SAFEMODE);
if (!mdi) {
if (verbose)
pr_err("Failed to read sysfs attributes for "
rv = 0;
if (rv) {
- int state_fd = sysfs_open(fd2devnum(fd), NULL, "array_state");
+ int state_fd = sysfs_open(fd2devnm(fd), NULL, "array_state");
char buf[20];
- fd_set fds;
- struct timeval tm;
+ int delay = 5000;
/* minimize the safe_mode_delay and prepare to wait up to 5s
* for writes to quiesce
*/
sysfs_set_safemode(mdi, 1);
- tm.tv_sec = 5;
- tm.tv_usec = 0;
-
- FD_ZERO(&fds);
/* wait for array_state to be clean */
while (1) {
break;
if (sysfs_match_word(buf, clean_states) <= 4)
break;
- FD_SET(state_fd, &fds);
- rv = select(state_fd + 1, NULL, NULL, &fds, &tm);
+ rv = sysfs_wait(state_fd, &delay);
if (rv < 0 && errno != EINTR)
break;
lseek(state_fd, 0, SEEK_SET);
projects / thirdparty / mdadm.git / blobdiff