[PATCH 0/2] Supplement for raid0->raid10 takeover for imsm metadata

This series supplements last raid0<->raid10 series.
Patch "raid0->raid10 takeover- allocate memory for added disks"
replaces the last patch of last series.
Patch "raid0->raid10 takeover- process metadata update"
imlements final metadata update.


---

Krzysztof Wojcik (2):
raid0->raid10 takeover- allocate memory for added disks
raid0->raid10 takeover- process metadata update


super-intel.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 112 insertions(+), 16 deletions(-)

--
Krzysztof Wojcik
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH 2/2] raid0->raid10 takeover- process metadata update

Implementation of raid0->raid10 takeover metadata update
at process_update level.
- We are using memory prievously alocated in prepare_update to
create two dummy disks will be inserted in the metadata and
new imsm_dev structure with expanded disk order table.
- Update indexes in disk list
- Update metadata map
- Update disk order table

Signed-off-by: Krzysztof Wojcik
---
super-intel.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/super-intel.c b/super-intel.c
index 642feba..95940a1 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -5815,22 +5815,25 @@ update_reshape_exit:
}

static int apply_takeover_update(struct imsm_update_takeover *u,
- struct intel_super *super)
+ struct intel_super *super,
+ void ***space_list)
{
struct imsm_dev *dev = NULL;
+ struct intel_dev *dv;
+ struct imsm_dev *dev_new;
struct imsm_map *map;
struct dl *dm, *du;
- int *tab;
int i;

- dev = get_imsm_dev(super, u->subarray);
+ for (dv = super->devlist; dv; dv = dv->next)
+ if (dv->index == (unsigned int)u->subarray) {
+ dev = dv->dev;
+ break;
+ }

if (dev == NULL)
return 0;

- map = get_imsm_map(dev, 0);
- tab = (int *)&map->disk_ord_tbl;
-
if (u->direction == R10_TO_R0) {
/* iterate through devices to mark removed disks as spare */
for (i = 0; i < TAKEOVER_DISKS; i++) {
@@ -5845,22 +5848,67 @@ static int apply_takeover_update(struct imsm_update_takeover *u,
dm->index = -1;
}
}
- /* update disk order table */
- i = 0;
- for (du = super->disks; du; du = du->next) {
- if (du->index >= 0) {
- tab[du->index] = i;
- i++;
- }
- }
/* update map */
- map->num_members = 2;
+ map = get_imsm_map(dev, 0);
+
+ map->num_members = map->num_members / 2;
map->map_state = IMSM_T_STATE_NORMAL;
map->num_domains = 1;
map->raid_level = 0;
map->failed_disk_num = -1;
}

+ if (u->direction == R0_TO_R10) {
+ void **space;
+ /* update slots in current disk list */
+ for (dm = super->disks; dm; dm = dm->next) {
+ if (dm->index >= 0)
+ dm->index *= 2;
+ }
+ /* create new *missing* disks */
+ for (i = 0; i < TAKEOVER_DISKS; i++) {
+ space = *space_list;
+ if (!space)
+ continue;
+ *space_list = *space;
+ du = (void*)space;
+ memcpy(du, super->disks, sizeof(*du));
+ du->disk.status = FAILED_DISK;
+ du->disk.scsi_id = 0;
+ du->fd = -1;
+ du->minor = 0;
+ du->major = 0;
+ du->index = (i * 2) + 1;
+ sprintf((char *)du->disk.serial, " MISSING_%d", du->index);
+ sprintf((char *)du->serial, "MISSING_%d", du->index);
+ du->next = super->missing;
+ super->missing = du;
+ }
+ /* create new dev and map */
+ space = *space_list;
+ if (!space)
+ return 0;
+ *space_list = *space;
+ dev_new = (void*)space;
+ memcpy(dev_new, dev, sizeof(*dev));
+ /* update new map */
+ map = get_imsm_map(dev_new, 0);
+ map->failed_disk_num = map->num_members;
+ map->num_members = map->num_members * 2;
+ map->map_state = IMSM_T_STATE_NORMAL;
+ map->num_domains = 2;
+ map->raid_level = 1;
+ /* replace dev<->dev_new */
+ dv->dev = dev_new;
+ }
+ /* update disk order table */
+ for (du = super->disks; du; du = du->next)
+ if (du->index >= 0)
+ set_imsm_ord_tbl_ent(map, du->index, du->index);
+ for (du = super->missing; du; du = du->next)
+ if (du->index >= 0)
+ set_imsm_ord_tbl_ent(map, du->index, du->index | IMSM_ORD_REBUILD);
+
return 1;
}

@@ -5908,7 +5956,7 @@ static void imsm_process_update(struct supertype *st,
switch (type) {
case update_takeover: {
struct imsm_update_takeover *u = (void *)update->buf;
- if (apply_takeover_update(u, super))
+ if (apply_takeover_update(u, super, &update->space_list))
super->updates_pending++;
break;
}

--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html