static void print_imsm_disk(struct imsm_super *mpb, int index)
{
struct imsm_disk *disk = __get_imsm_disk(mpb, index);
- char str[MAX_RAID_SERIAL_LEN];
+ char str[MAX_RAID_SERIAL_LEN + 1];
__u32 s;
__u64 sz;
return;
printf("\n");
- snprintf(str, MAX_RAID_SERIAL_LEN, "%s", disk->serial);
+ snprintf(str, MAX_RAID_SERIAL_LEN + 1, "%s", disk->serial);
printf(" Disk%02d Serial : %s\n", index, str);
s = __le32_to_cpu(disk->status);
printf(" State :%s%s%s%s\n", s&SPARE_DISK ? " spare" : "",
info->array.md_minor = -1;
info->array.ctime = 0;
info->array.utime = 0;
- info->array.chunk_size = __le16_to_cpu(map->blocks_per_strip * 512);
+ info->array.chunk_size = __le16_to_cpu(map->blocks_per_strip) << 9;
+ info->array.state = !dev->vol.dirty;
+
+ info->disk.major = 0;
+ info->disk.minor = 0;
info->data_offset = __le32_to_cpu(map->pba_of_lba0);
info->component_size = __le32_to_cpu(map->blocks_per_member);
+ memset(info->uuid, 0, sizeof(info->uuid));
- info->disk.major = 0;
- info->disk.minor = 0;
+ if (map->map_state == IMSM_T_STATE_UNINITIALIZED ||
+ dev->vol.dirty || dev->vol.migr_state)
+ info->resync_start = 0;
+ else
+ info->resync_start = ~0ULL;
+
+ strncpy(info->name, (char *) dev->volume, MAX_RAID_SERIAL_LEN);
+ info->name[MAX_RAID_SERIAL_LEN] = 0;
sprintf(info->text_version, "/%s/%d",
devnum2devname(st->container_dev),
info->container_member);
+ info->safe_mode_delay = 4000; /* 4 secs like the Matrix driver */
}
info->disk.raid_disk = -1;
info->reshape_active = 0;
strcpy(info->text_version, "imsm");
+ info->safe_mode_delay = 0;
info->disk.number = -1;
info->disk.state = 0;
unsigned char scsi_serial[255];
int rv;
int rsp_len;
- int i, cnt;
+ int len;
+ char *c, *rsp_buf;
memset(scsi_serial, 0, sizeof(scsi_serial));
return rv;
}
+ /* trim whitespace */
rsp_len = scsi_serial[3];
- for (i = 0, cnt = 0; i < rsp_len; i++) {
- if (!isspace(scsi_serial[4 + i]))
- serial[cnt++] = scsi_serial[4 + i];
- if (cnt == MAX_RAID_SERIAL_LEN)
- break;
- }
-
- serial[MAX_RAID_SERIAL_LEN - 1] = '\0';
+ rsp_buf = (char *) &scsi_serial[4];
+ c = rsp_buf;
+ while (isspace(*c))
+ c++;
+ if (c + MAX_RAID_SERIAL_LEN > rsp_buf + rsp_len)
+ len = rsp_len - (c - rsp_buf);
+ else
+ len = MAX_RAID_SERIAL_LEN;
+ memcpy(serial, c, len);
+ c = (char *) &serial[len - 1];
+ while (isspace(*c) || *c == '\0')
+ *c-- = '\0';
return 0;
}
+static int serialcmp(__u8 *s1, __u8 *s2)
+{
+ return strncmp((char *) s1, (char *) s2, MAX_RAID_SERIAL_LEN);
+}
+
+static void serialcpy(__u8 *dest, __u8 *src)
+{
+ strncpy((char *) dest, (char *) src, MAX_RAID_SERIAL_LEN);
+}
+
static int
load_imsm_disk(int fd, struct intel_super *super, char *devname, int keep_fd)
{
* check if we need to update dl->index
*/
for (dl = super->disks; dl; dl = dl->next)
- if (memcmp(dl->serial, serial, MAX_RAID_SERIAL_LEN) == 0)
+ if (serialcmp(dl->serial, serial) == 0)
break;
if (!dl)
dl->next = super->disks;
dl->fd = keep_fd ? fd : -1;
dl->devname = devname ? strdup(devname) : NULL;
- strncpy((char *) dl->serial, (char *) serial, MAX_RAID_SERIAL_LEN);
+ serialcpy(dl->serial, serial);
dl->index = -2;
} else if (keep_fd) {
close(dl->fd);
disk_iter = __get_imsm_disk(super->anchor, i);
- if (memcmp(disk_iter->serial, dl->serial,
- MAX_RAID_SERIAL_LEN) == 0) {
+ if (serialcmp(disk_iter->serial, dl->serial) == 0) {
__u32 status;
dl->disk = *disk_iter;
get_dev_size(fd, NULL, &size);
size /= 512;
status = USABLE_DISK | SPARE_DISK;
- strcpy((char *) dd->disk.serial, (char *) dd->serial);
+ serialcpy(dd->disk.serial, dd->serial);
dd->disk.total_blocks = __cpu_to_le32(size);
dd->disk.status = __cpu_to_le32(status);
if (sysfs_disk_to_scsi_id(fd, &id) == 0)
for (i = 0; i < mpb->num_raid_devs; i++) {
struct imsm_dev *dev = get_imsm_dev(super, i);
- struct imsm_vol *vol = &dev->vol;
struct imsm_map *map = get_imsm_map(dev, 0);
struct mdinfo *this;
int slot;
memset(this, 0, sizeof(*this));
this->next = rest;
- this->array.level = get_imsm_raid_level(map);
- this->array.raid_disks = map->num_members;
- this->array.layout = imsm_level_to_layout(this->array.level);
- this->array.md_minor = -1;
- this->array.ctime = 0;
- this->array.utime = 0;
- this->array.chunk_size = __le16_to_cpu(map->blocks_per_strip) << 9;
- this->array.state = !vol->dirty;
- this->container_member = i;
- if (map->map_state == IMSM_T_STATE_UNINITIALIZED ||
- dev->vol.dirty || dev->vol.migr_state)
- this->resync_start = 0;
- else
- this->resync_start = ~0ULL;
-
- strncpy(this->name, (char *) dev->volume, MAX_RAID_SERIAL_LEN);
- this->name[MAX_RAID_SERIAL_LEN] = 0;
-
- sprintf(this->text_version, "/%s/%d",
- devnum2devname(st->container_dev),
- this->container_member);
-
- memset(this->uuid, 0, sizeof(this->uuid));
-
- this->component_size = __le32_to_cpu(map->blocks_per_member);
-
+ super->current_vol = i;
+ getinfo_super_imsm_volume(st, this);
for (slot = 0 ; slot < map->num_members; slot++) {
struct mdinfo *info_d;
struct dl *d;
return dl;
}
-static struct dl *imsm_add_spare(struct intel_super *super, int idx, struct active_array *a)
+static struct dl *imsm_add_spare(struct intel_super *super, int slot, struct active_array *a)
{
struct imsm_dev *dev = get_imsm_dev(super, a->info.container_member);
+ int idx = get_imsm_disk_idx(dev, slot);
struct imsm_map *map = get_imsm_map(dev, 0);
unsigned long long esize;
unsigned long long pos;
for (dl = super->disks; dl; dl = dl->next) {
/* If in this array, skip */
for (d = a->info.devs ; d ; d = d->next)
- if (d->disk.major == dl->major &&
+ if (d->state_fd >= 0 &&
+ d->disk.major == dl->major &&
d->disk.minor == dl->minor) {
dprintf("%x:%x already in array\n", dl->major, dl->minor);
break;
if (d)
continue;
- /* skip marked in use or failed drives */
+ /* skip in use or failed drives */
status = __le32_to_cpu(dl->disk.status);
- if (status & FAILED_DISK || status & CONFIGURED_DISK) {
+ if (status & FAILED_DISK || idx == dl->index) {
dprintf("%x:%x status ( %s%s)\n",
dl->major, dl->minor,
status & FAILED_DISK ? "failed " : "",
- status & CONFIGURED_DISK ? "configured " : "");
+ idx == dl->index ? "in use " : "");
continue;
}
if (!dl) {
fprintf(stderr, "error: imsm_activate_spare passed "
- "an unknown disk (index: %d serial: %s)\n",
- u->dl->index, u->dl->serial);
+ "an unknown disk (index: %d)\n",
+ u->dl->index);
return;
}
for (a = st->arrays; a; a = a->next)
a->check_degraded = 1;
}
- /* check if we can add / replace some disks in the
- * metadata */
+ /* add some spares to the metadata */
while (super->add) {
- struct dl **dlp, *dl, *al;
+ struct dl *al;
+
al = super->add;
super->add = al->next;
- for (dlp = &super->disks; *dlp ; ) {
- if (memcmp(al->serial, (*dlp)->serial,
- MAX_RAID_SERIAL_LEN) == 0) {
- dl = *dlp;
- *dlp = (*dlp)->next;
- __free_imsm_disk(dl);
- break;
- } else
- dlp = &(*dlp)->next;
- }
al->next = super->disks;
super->disks = al;
+ dprintf("%s: added %x:%x\n",
+ __func__, al->major, al->minor);
}
break;
projects / thirdparty / mdadm.git / blobdiff