return st;
}
+#ifndef MDASSEMBLE
static __u8 *get_imsm_version(struct imsm_super *mpb)
{
return &mpb->sig[MPB_SIG_LEN];
}
+#endif
/* retrieve a disk directly from the anchor when the anchor is known to be
* up-to-date, currently only at load time
return &mpb->disk[index];
}
+#ifndef MDASSEMBLE
/* retrieve a disk from the parsed metadata */
static struct imsm_disk *get_imsm_disk(struct intel_super *super, __u8 index)
{
return NULL;
}
+#endif
/* generate a checksum directly from the anchor when the anchor is known to be
* up-to-date, currently only at load or write_super after coalescing
return ord_to_idx(ord);
}
+static void set_imsm_ord_tbl_ent(struct imsm_map *map, int slot, __u32 ord)
+{
+ map->disk_ord_tbl[slot] = __cpu_to_le32(ord);
+}
+
static int get_imsm_raid_level(struct imsm_map *map)
{
if (map->raid_level == 1) {
return map->raid_level;
}
+#ifndef MDASSEMBLE
static int cmp_extent(const void *av, const void *bv)
{
const struct extent *a = av;
return rv;
}
-#ifndef MDASSEMBLE
static void print_imsm_dev(struct imsm_dev *dev, int index)
{
__u64 sz;
int slot;
struct imsm_map *map = get_imsm_map(dev, 0);
+ __u32 ord;
printf("\n");
printf("[%s]:\n", dev->volume);
for (slot = 0; slot < map->num_members; slot++)
if (index == get_imsm_disk_idx(dev, slot))
break;
- if (slot < map->num_members)
- printf(" This Slot : %d\n", slot);
- else
+ if (slot < map->num_members) {
+ ord = get_imsm_ord_tbl_ent(dev, slot);
+ printf(" This Slot : %d%s\n", slot,
+ ord & IMSM_ORD_REBUILD ? " (out-of-sync)" : "");
+ } else
printf(" This Slot : ?\n");
sz = __le32_to_cpu(dev->size_high);
sz <<= 32;
printf(" Map State : %s", map_state_str[map->map_state]);
if (dev->vol.migr_state) {
struct imsm_map *map = get_imsm_map(dev, 1);
- printf(", %s", map_state_str[map->map_state]);
+ printf(" <-- %s", map_state_str[map->map_state]);
}
printf("\n");
printf(" Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean");
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;
+
+ info->array.major_version = -1;
+ info->array.minor_version = -2;
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.minor = 0;
info->disk.raid_disk = -1;
info->reshape_active = 0;
+ info->array.major_version = -1;
+ info->array.minor_version = -2;
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));
- if (imsm_env_devname_as_serial()) {
- char name[MAX_RAID_SERIAL_LEN];
-
- fd2devname(fd, name);
- strcpy((char *) serial, name);
+ rv = scsi_get_serial(fd, scsi_serial, sizeof(scsi_serial));
+
+ if (rv && imsm_env_devname_as_serial()) {
+ memset(serial, 0, MAX_RAID_SERIAL_LEN);
+ fd2devname(fd, (char *) serial);
return 0;
}
- rv = scsi_get_serial(fd, scsi_serial, sizeof(scsi_serial));
-
if (rv != 0) {
if (devname)
fprintf(stderr,
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;
memcpy(dest, src, sizeof_imsm_dev(src, 0));
}
-static void dup_map(struct imsm_dev *dev)
+#ifndef MDASSEMBLE
+/* When migrating map0 contains the 'destination' state while map1
+ * contains the current state. When not migrating map0 contains the
+ * current state. This routine assumes that map[0].map_state is set to
+ * the current array state before being called.
+ *
+ * Migration is indicated by one of the following states
+ * 1/ Idle (migr_state=0 map0state=normal||unitialized||degraded||failed)
+ * 2/ Initialize (migr_state=1 migr_type=0 map0state=normal
+ * map1state=unitialized)
+ * 3/ Verify (Resync) (migr_state=1 migr_type=1 map0state=normal
+ * map1state=normal)
+ * 4/ Rebuild (migr_state=1 migr_type=1 map0state=normal
+ * map1state=degraded)
+ */
+static void migrate(struct imsm_dev *dev, __u8 to_state, int rebuild_resync)
{
- struct imsm_map *dest = get_imsm_map(dev, 1);
+ struct imsm_map *dest;
struct imsm_map *src = get_imsm_map(dev, 0);
+ dev->vol.migr_state = 1;
+ dev->vol.migr_type = rebuild_resync;
+ dest = get_imsm_map(dev, 1);
+
memcpy(dest, src, sizeof_imsm_map(src));
+ src->map_state = to_state;
}
+#endif
static int parse_raid_devices(struct intel_super *super)
{
map->num_members = info->raid_disks;
for (i = 0; i < map->num_members; i++) {
/* initialized in add_to_super */
- map->disk_ord_tbl[i] = __cpu_to_le32(0);
+ set_imsm_ord_tbl_ent(map, i, 0);
}
mpb->num_raid_devs++;
super->dev_tbl[super->current_vol] = dev;
return 1;
}
+#ifndef MDASSEMBLE
static void add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
int fd, char *devname)
{
dl->index = super->anchor->num_disks;
super->anchor->num_disks++;
}
- map->disk_ord_tbl[dk->number] = __cpu_to_le32(dl->index);
+ set_imsm_ord_tbl_ent(map, dk->number, dl->index);
status = CONFIGURED_DISK | USABLE_DISK;
dl->disk.status = __cpu_to_le32(status);
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)
return 0;
}
+
static int create_array(struct supertype *st)
{
size_t len;
return 0;
}
-static int add_disk(struct supertype *st)
+static int _add_disk(struct supertype *st)
{
struct intel_super *super = st->sb;
size_t len;
/* in the add disk case we are running in mdmon
* context, so don't close fd's
*/
- return add_disk(st);
+ return _add_disk(st);
} else
rv = create_array(st);
} else
return write_super_imsm(st->sb, 1);
}
+#endif
static int store_zero_imsm(struct supertype *st, int fd)
{
return 0;
}
+static int imsm_bbm_log_size(struct imsm_super *mpb)
+{
+ return __le32_to_cpu(mpb->bbm_log_size);
+}
+
+#ifndef MDASSEMBLE
static int validate_geometry_imsm_container(struct supertype *st, int level,
int layout, int raiddisks, int chunk,
unsigned long long size, char *dev,
return 1;
}
-int imsm_bbm_log_size(struct imsm_super *mpb)
-{
- return __le32_to_cpu(mpb->bbm_log_size);
-}
-
static int validate_geometry_imsm(struct supertype *st, int level, int layout,
int raiddisks, int chunk, unsigned long long size,
char *dev, unsigned long long *freesize,
return 1;
}
+#endif /* MDASSEMBLE */
static struct mdinfo *container_content_imsm(struct supertype *st)
{
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;
}
+#ifndef MDASSEMBLE
static int imsm_open_new(struct supertype *c, struct active_array *a,
char *inst)
{
struct imsm_map *map = get_imsm_map(dev, 0);
for (i = 0; i < map->num_members; i++) {
- int idx = get_imsm_disk_idx(dev, i);
+ __u32 ord = get_imsm_ord_tbl_ent(dev, i);
+ int idx = ord_to_idx(ord);
disk = get_imsm_disk(super, idx);
- if (!disk)
- failed++;
- else if (__le32_to_cpu(disk->status) & FAILED_DISK)
- failed++;
- else if (!(__le32_to_cpu(disk->status) & USABLE_DISK))
+ if (!disk ||
+ __le32_to_cpu(disk->status) & FAILED_DISK ||
+ ord & IMSM_ORD_REBUILD)
failed++;
}
return failed;
}
+static int is_resyncing(struct imsm_dev *dev)
+{
+ struct imsm_map *migr_map;
+
+ if (!dev->vol.migr_state)
+ return 0;
+
+ if (dev->vol.migr_type == 0)
+ return 1;
+
+ migr_map = get_imsm_map(dev, 1);
+
+ if (migr_map->map_state == IMSM_T_STATE_NORMAL)
+ return 1;
+ else
+ return 0;
+}
+
+static int is_rebuilding(struct imsm_dev *dev)
+{
+ struct imsm_map *migr_map;
+
+ if (!dev->vol.migr_state)
+ return 0;
+
+ if (dev->vol.migr_type == 0)
+ return 0;
+
+ migr_map = get_imsm_map(dev, 1);
+
+ if (migr_map->map_state == IMSM_T_STATE_DEGRADED)
+ return 1;
+ else
+ return 0;
+}
+
+/* Handle dirty -> clean transititions and resync. Degraded and rebuild
+ * states are handled in imsm_set_disk() with one exception, when a
+ * resync is stopped due to a new failure this routine will set the
+ * 'degraded' state for the array.
+ */
static int imsm_set_array_state(struct active_array *a, int consistent)
{
int inst = a->info.container_member;
struct intel_super *super = a->container->sb;
struct imsm_dev *dev = get_imsm_dev(super, inst);
struct imsm_map *map = get_imsm_map(dev, 0);
- int dirty = !consistent;
- int failed;
- __u8 map_state;
-
- failed = imsm_count_failed(super, dev);
- map_state = imsm_check_degraded(super, dev, failed);
+ int failed = imsm_count_failed(super, dev);
+ __u8 map_state = imsm_check_degraded(super, dev, failed);
- if (consistent && !dev->vol.dirty &&
- (dev->vol.migr_state || map_state != IMSM_T_STATE_NORMAL))
- a->resync_start = 0ULL;
- if (consistent == 2 && a->resync_start != ~0ULL)
+ if (consistent == 2 &&
+ (a->resync_start != ~0ULL ||
+ map_state != IMSM_T_STATE_NORMAL ||
+ dev->vol.migr_state))
consistent = 0;
if (a->resync_start == ~0ULL) {
- /* complete recovery or initial resync */
- if (map->map_state != map_state) {
- dprintf("imsm: map_state %d: %d\n",
- inst, map_state);
- map->map_state = map_state;
- super->updates_pending++;
- }
- if (dev->vol.migr_state) {
- dprintf("imsm: mark resync complete\n");
+ /* complete intialization / resync,
+ * recovery is completed in ->set_disk
+ */
+ if (is_resyncing(dev)) {
+ dprintf("imsm: mark resync done\n");
dev->vol.migr_state = 0;
- dev->vol.migr_type = 0;
+ map->map_state = map_state;
super->updates_pending++;
}
- } else if (!dev->vol.migr_state) {
- dprintf("imsm: mark '%s' (%llu)\n",
- failed ? "rebuild" : "initializing", a->resync_start);
- /* mark that we are rebuilding */
- map->map_state = failed ? map_state : IMSM_T_STATE_NORMAL;
- dev->vol.migr_state = 1;
- dev->vol.migr_type = failed ? 1 : 0;
- dup_map(dev);
- a->check_degraded = 1;
+ } else if (!is_resyncing(dev) && !failed) {
+ /* mark the start of the init process if nothing is failed */
+ dprintf("imsm: mark resync start (%llu)\n", a->resync_start);
+ map->map_state = map_state;
+ migrate(dev, IMSM_T_STATE_NORMAL,
+ map->map_state == IMSM_T_STATE_NORMAL);
super->updates_pending++;
}
/* mark dirty / clean */
- if (dirty != dev->vol.dirty) {
+ if (dev->vol.dirty != !consistent) {
dprintf("imsm: mark '%s' (%llu)\n",
- dirty ? "dirty" : "clean", a->resync_start);
- dev->vol.dirty = dirty;
+ consistent ? "clean" : "dirty", a->resync_start);
+ if (consistent)
+ dev->vol.dirty = 0;
+ else
+ dev->vol.dirty = 1;
super->updates_pending++;
}
return consistent;
struct imsm_dev *dev = get_imsm_dev(super, inst);
struct imsm_map *map = get_imsm_map(dev, 0);
struct imsm_disk *disk;
+ int failed;
__u32 status;
- int failed = 0;
- int new_failure = 0;
+ __u32 ord;
+ __u8 map_state;
if (n > map->num_members)
fprintf(stderr, "imsm: set_disk %d out of range 0..%d\n",
dprintf("imsm: set_disk %d:%x\n", n, state);
- disk = get_imsm_disk(super, get_imsm_disk_idx(dev, n));
+ ord = get_imsm_ord_tbl_ent(dev, n);
+ disk = get_imsm_disk(super, ord_to_idx(ord));
/* check for new failures */
status = __le32_to_cpu(disk->status);
if ((state & DS_FAULTY) && !(status & FAILED_DISK)) {
status |= FAILED_DISK;
disk->status = __cpu_to_le32(status);
- disk->scsi_id = __cpu_to_le32(~0UL);
+ disk->scsi_id = __cpu_to_le32(~(__u32)0);
memmove(&disk->serial[0], &disk->serial[1], MAX_RAID_SERIAL_LEN - 1);
- new_failure = 1;
super->updates_pending++;
}
/* check if in_sync */
- if ((state & DS_INSYNC) && !(status & USABLE_DISK)) {
- status |= USABLE_DISK;
- disk->status = __cpu_to_le32(status);
+ if (state & DS_INSYNC && ord & IMSM_ORD_REBUILD) {
+ struct imsm_map *migr_map = get_imsm_map(dev, 1);
+
+ set_imsm_ord_tbl_ent(migr_map, n, ord_to_idx(ord));
super->updates_pending++;
}
- /* the number of failures have changed, count up 'failed' to determine
- * degraded / failed status
- */
- if (new_failure && map->map_state != IMSM_T_STATE_FAILED)
- failed = imsm_count_failed(super, dev);
-
- /* determine map_state based on failed or in_sync count */
- if (failed)
- map->map_state = imsm_check_degraded(super, dev, failed);
- else if (map->map_state == IMSM_T_STATE_DEGRADED) {
- struct mdinfo *d;
- int working = 0;
-
- for (d = a->info.devs ; d ; d = d->next)
- if (d->curr_state & DS_INSYNC)
- working++;
+ failed = imsm_count_failed(super, dev);
+ map_state = imsm_check_degraded(super, dev, failed);
- if (working == a->info.array.raid_disks) {
- map->map_state = IMSM_T_STATE_NORMAL;
- dev->vol.migr_state = 0;
- dev->vol.migr_type = 0;
- super->updates_pending++;
- }
+ /* check if recovery complete, newly degraded, or failed */
+ if (map_state == IMSM_T_STATE_NORMAL && is_rebuilding(dev)) {
+ map->map_state = map_state;
+ dev->vol.migr_state = 0;
+ super->updates_pending++;
+ } else if (map_state == IMSM_T_STATE_DEGRADED &&
+ map->map_state != map_state &&
+ !dev->vol.migr_state) {
+ dprintf("imsm: mark degraded\n");
+ map->map_state = map_state;
+ super->updates_pending++;
+ } else if (map_state == IMSM_T_STATE_FAILED &&
+ map->map_state != map_state) {
+ dprintf("imsm: mark failed\n");
+ dev->vol.migr_state = 0;
+ map->map_state = map_state;
+ super->updates_pending++;
}
}
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;
}
return 0;
}
-static void imsm_delete(struct intel_super *super, struct dl **dlp);
+static void imsm_delete(struct intel_super *super, struct dl **dlp, int index);
static void imsm_process_update(struct supertype *st,
struct metadata_update *update)
struct imsm_update_activate_spare *u = (void *) update->buf;
struct imsm_dev *dev = get_imsm_dev(super, u->array);
struct imsm_map *map = get_imsm_map(dev, 0);
+ struct imsm_map *migr_map;
struct active_array *a;
struct imsm_disk *disk;
__u32 status;
+ __u8 to_state;
struct dl *dl;
unsigned int found;
- int victim;
+ int failed;
+ int victim = get_imsm_disk_idx(dev, u->slot);
int i;
for (dl = super->disks; dl; dl = dl->next)
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;
}
super->updates_pending++;
+ /* count failures (excluding rebuilds and the victim)
+ * to determine map[0] state
+ */
+ failed = 0;
+ for (i = 0; i < map->num_members; i++) {
+ if (i == u->slot)
+ continue;
+ disk = get_imsm_disk(super, get_imsm_disk_idx(dev, i));
+ if (!disk ||
+ __le32_to_cpu(disk->status) & FAILED_DISK)
+ failed++;
+ }
+
/* adding a pristine spare, assign a new index */
if (dl->index < 0) {
dl->index = super->anchor->num_disks;
super->anchor->num_disks++;
}
- victim = get_imsm_disk_idx(dev, u->slot);
- map->disk_ord_tbl[u->slot] = __cpu_to_le32(dl->index);
disk = &dl->disk;
status = __le32_to_cpu(disk->status);
status |= CONFIGURED_DISK;
- status &= ~(SPARE_DISK | USABLE_DISK);
+ status &= ~SPARE_DISK;
disk->status = __cpu_to_le32(status);
+ /* mark rebuild */
+ to_state = imsm_check_degraded(super, dev, failed);
+ map->map_state = IMSM_T_STATE_DEGRADED;
+ migrate(dev, to_state, 1);
+ migr_map = get_imsm_map(dev, 1);
+ set_imsm_ord_tbl_ent(map, u->slot, dl->index);
+ set_imsm_ord_tbl_ent(migr_map, u->slot, dl->index | IMSM_ORD_REBUILD);
+
/* count arrays using the victim in the metadata */
found = 0;
for (a = st->arrays; a ; a = a->next) {
found++;
}
- /* clear some flags if the victim is no longer being
+ /* delete the victim if it is no longer being
* utilized anywhere
*/
if (!found) {
struct dl **dlp;
- for (dlp = &super->disks; *dlp; )
+
+ for (dlp = &super->disks; *dlp; dlp = &(*dlp)->next)
if ((*dlp)->index == victim)
break;
- disk = &(*dlp)->disk;
- status = __le32_to_cpu(disk->status);
- status &= ~(CONFIGURED_DISK | USABLE_DISK);
- disk->status = __cpu_to_le32(status);
/* We know that 'manager' isn't touching anything,
* so it is safe to:
*/
- imsm_delete(super, dlp);
+ imsm_delete(super, dlp, victim);
}
break;
}
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;
}
/* must be called while manager is quiesced */
-static void imsm_delete(struct intel_super *super, struct dl **dlp)
+static void imsm_delete(struct intel_super *super, struct dl **dlp, int index)
{
struct imsm_super *mpb = super->anchor;
- struct dl *dl = *dlp;
struct dl *iter;
struct imsm_dev *dev;
struct imsm_map *map;
- int i, j;
+ int i, j, num_members;
+ __u32 ord;
- dprintf("%s: deleting device %x:%x from imsm_super\n",
- __func__, dl->major, dl->minor);
+ dprintf("%s: deleting device[%d] from imsm_super\n",
+ __func__, index);
/* shift all indexes down one */
for (iter = super->disks; iter; iter = iter->next)
- if (iter->index > dl->index)
+ if (iter->index > index)
iter->index--;
for (i = 0; i < mpb->num_raid_devs; i++) {
dev = get_imsm_dev(super, i);
map = get_imsm_map(dev, 0);
+ num_members = map->num_members;
+ for (j = 0; j < num_members; j++) {
+ /* update ord entries being careful not to propagate
+ * ord-flags to the first map
+ */
+ ord = get_imsm_ord_tbl_ent(dev, j);
- for (j = 0; j < map->num_members; j++) {
- int idx = get_imsm_disk_idx(dev, j);
+ if (ord_to_idx(ord) <= index)
+ continue;
- if (idx > dl->index)
- map->disk_ord_tbl[j] = __cpu_to_le32(idx - 1);
+ map = get_imsm_map(dev, 0);
+ set_imsm_ord_tbl_ent(map, j, ord_to_idx(ord - 1));
+ map = get_imsm_map(dev, 1);
+ if (map)
+ set_imsm_ord_tbl_ent(map, j, ord - 1);
}
}
mpb->num_disks--;
super->updates_pending++;
- *dlp = (*dlp)->next;
- __free_imsm_disk(dl);
+ if (*dlp) {
+ struct dl *dl = *dlp;
+
+ *dlp = (*dlp)->next;
+ __free_imsm_disk(dl);
+ }
}
+#endif /* MDASSEMBLE */
struct superswitch super_imsm = {
#ifndef MDASSEMBLE
.detail_super = detail_super_imsm,
.brief_detail_super = brief_detail_super_imsm,
.write_init_super = write_init_super_imsm,
+ .validate_geometry = validate_geometry_imsm,
+ .add_to_super = add_to_super_imsm,
#endif
.match_home = match_home_imsm,
.uuid_from_super= uuid_from_super_imsm,
.load_super = load_super_imsm,
.init_super = init_super_imsm,
- .add_to_super = add_to_super_imsm,
.store_super = store_zero_imsm,
.free_super = free_super_imsm,
.match_metadata_desc = match_metadata_desc_imsm,
.container_content = container_content_imsm,
- .validate_geometry = validate_geometry_imsm,
.external = 1,
+#ifndef MDASSEMBLE
/* for mdmon */
.open_new = imsm_open_new,
.load_super = load_super_imsm,
.activate_spare = imsm_activate_spare,
.process_update = imsm_process_update,
.prepare_update = imsm_prepare_update,
+#endif /* MDASSEMBLE */
};
projects / thirdparty / mdadm.git / blobdiff