Teach sysfs_add_disk() callers to use ->recovery_start versus 'insync' parameter
Also fixup 'in_sync' versus 'insync' typo. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
parent
b7528a20cc
commit
d23534e464
|
@ -1286,7 +1286,7 @@ int assemble_container_content(struct supertype *st, int mdfd,
|
|||
sysfs_free(sra);
|
||||
|
||||
for (dev = content->devs; dev; dev = dev->next)
|
||||
if (sysfs_add_disk(content, dev, 1) == 0)
|
||||
if (sysfs_add_disk(content, dev) == 0)
|
||||
working++;
|
||||
else if (errno == EEXIST)
|
||||
preexist++;
|
||||
|
|
3
Manage.c
3
Manage.c
|
@ -696,7 +696,8 @@ int Manage_subdevs(char *devname, int fd,
|
|||
tst->ss->getinfo_super(tst, &new_mdi);
|
||||
new_mdi.disk.major = disc.major;
|
||||
new_mdi.disk.minor = disc.minor;
|
||||
if (sysfs_add_disk(sra, &new_mdi, 0) != 0) {
|
||||
new_mdi.recovery_start = 0;
|
||||
if (sysfs_add_disk(sra, &new_mdi) != 0) {
|
||||
fprintf(stderr, Name ": add new device to external metadata"
|
||||
" failed for %s\n", dv->devname);
|
||||
close(container_fd);
|
||||
|
|
|
@ -410,7 +410,7 @@ static void manage_member(struct mdstat_ent *mdstat,
|
|||
newd = malloc(sizeof(*newd));
|
||||
if (!newd)
|
||||
continue;
|
||||
if (sysfs_add_disk(&newa->info, d, 0) < 0) {
|
||||
if (sysfs_add_disk(&newa->info, d) < 0) {
|
||||
free(newd);
|
||||
continue;
|
||||
}
|
||||
|
|
3
mdadm.h
3
mdadm.h
|
@ -385,8 +385,7 @@ extern int sysfs_get_str(struct mdinfo *sra, struct mdinfo *dev,
|
|||
char *name, char *val, int size);
|
||||
extern int sysfs_set_safemode(struct mdinfo *sra, unsigned long ms);
|
||||
extern int sysfs_set_array(struct mdinfo *info, int vers);
|
||||
extern int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd,
|
||||
int in_sync);
|
||||
extern int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd);
|
||||
extern int sysfs_disk_to_scsi_id(int fd, __u32 *id);
|
||||
extern int sysfs_unique_holder(int devnum, long rdev);
|
||||
extern int load_sys(char *path, char *buf);
|
||||
|
|
|
@ -2968,6 +2968,7 @@ static struct mdinfo *container_content_ddf(struct supertype *st)
|
|||
dev->disk.minor = d->minor;
|
||||
dev->disk.raid_disk = i;
|
||||
dev->disk.state = (1<<MD_DISK_SYNC)|(1<<MD_DISK_ACTIVE);
|
||||
dev->recovery_start = MaxSector;
|
||||
|
||||
dev->events = __be32_to_cpu(ddf->primary.seq);
|
||||
dev->data_offset = __be64_to_cpu(vc->lba_offset[i]);
|
||||
|
@ -3547,6 +3548,7 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
|
|||
di->disk.major = dl->major;
|
||||
di->disk.minor = dl->minor;
|
||||
di->disk.state = 0;
|
||||
di->recovery_start = 0;
|
||||
di->data_offset = pos;
|
||||
di->component_size = a->info.component_size;
|
||||
di->container_member = dl->pdnum;
|
||||
|
|
|
@ -3876,6 +3876,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
|
|||
info_d->disk.major = d->major;
|
||||
info_d->disk.minor = d->minor;
|
||||
info_d->disk.raid_disk = slot;
|
||||
info_d->recovery_start = MaxSector;
|
||||
|
||||
this->array.working_disks++;
|
||||
|
||||
|
@ -4454,6 +4455,7 @@ static struct mdinfo *imsm_activate_spare(struct active_array *a,
|
|||
di->disk.major = dl->major;
|
||||
di->disk.minor = dl->minor;
|
||||
di->disk.state = 0;
|
||||
di->recovery_start = 0;
|
||||
di->data_offset = __le32_to_cpu(map->pba_of_lba0);
|
||||
di->component_size = a->info.component_size;
|
||||
di->container_member = inst;
|
||||
|
|
6
sysfs.c
6
sysfs.c
|
@ -572,7 +572,7 @@ int sysfs_set_array(struct mdinfo *info, int vers)
|
|||
return rv;
|
||||
}
|
||||
|
||||
int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd, int in_sync)
|
||||
int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd)
|
||||
{
|
||||
char dv[100];
|
||||
char nm[100];
|
||||
|
@ -598,11 +598,11 @@ int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd, int in_sync)
|
|||
rv = sysfs_set_num(sra, sd, "offset", sd->data_offset);
|
||||
rv |= sysfs_set_num(sra, sd, "size", (sd->component_size+1) / 2);
|
||||
if (sra->array.level != LEVEL_CONTAINER) {
|
||||
if (in_sync)
|
||||
if (sd->recovery_start == MaxSector)
|
||||
/* This can correctly fail if array isn't started,
|
||||
* yet, so just ignore status for now.
|
||||
*/
|
||||
sysfs_set_str(sra, sd, "state", "in_sync");
|
||||
sysfs_set_str(sra, sd, "state", "insync");
|
||||
rv |= sysfs_set_num(sra, sd, "slot", sd->disk.raid_disk);
|
||||
}
|
||||
return rv;
|
||||
|
|
7
util.c
7
util.c
|
@ -1162,8 +1162,11 @@ int add_disk(int mdfd, struct supertype *st,
|
|||
int rv;
|
||||
#ifndef MDASSEMBLE
|
||||
if (st->ss->external) {
|
||||
rv = sysfs_add_disk(sra, info,
|
||||
info->disk.state & (1<<MD_DISK_SYNC));
|
||||
if (info->disk.state & (1<<MD_DISK_SYNC))
|
||||
info->recovery_start = MaxSector;
|
||||
else
|
||||
info->recovery_start = 0;
|
||||
rv = sysfs_add_disk(sra, info);
|
||||
if (! rv) {
|
||||
struct mdinfo *sd2;
|
||||
for (sd2 = sra->devs; sd2; sd2=sd2->next)
|
||||
|
|
Loading…
Reference in New Issue