maps.c (mdadm-4.1) | : | maps.c (mdadm-4.2) | ||
---|---|---|---|---|
skipping to change at line 76 | skipping to change at line 76 | |||
{ "left-asymmetric-6", ALGORITHM_LEFT_ASYMMETRIC_6}, | { "left-asymmetric-6", ALGORITHM_LEFT_ASYMMETRIC_6}, | |||
{ "right-asymmetric-6", ALGORITHM_RIGHT_ASYMMETRIC_6}, | { "right-asymmetric-6", ALGORITHM_RIGHT_ASYMMETRIC_6}, | |||
{ "left-symmetric-6", ALGORITHM_LEFT_SYMMETRIC_6}, | { "left-symmetric-6", ALGORITHM_LEFT_SYMMETRIC_6}, | |||
{ "right-symmetric-6", ALGORITHM_RIGHT_SYMMETRIC_6}, | { "right-symmetric-6", ALGORITHM_RIGHT_SYMMETRIC_6}, | |||
{ "parity-first-6", ALGORITHM_PARITY_0_6}, | { "parity-first-6", ALGORITHM_PARITY_0_6}, | |||
{ NULL, UnSet } | { NULL, UnSet } | |||
}; | }; | |||
/* raid0 layout is only needed because of a bug in 3.14 which changed | ||||
* the effective layout of raid0 arrays with varying device sizes. | ||||
*/ | ||||
mapping_t r0layout[] = { | ||||
{ "original", RAID0_ORIG_LAYOUT}, | ||||
{ "alternate", RAID0_ALT_MULTIZONE_LAYOUT}, | ||||
{ "1", 1}, /* aka ORIG */ | ||||
{ "2", 2}, /* aka ALT */ | ||||
{ "dangerous", 0}, | ||||
{ NULL, UnSet}, | ||||
}; | ||||
mapping_t pers[] = { | mapping_t pers[] = { | |||
{ "linear", LEVEL_LINEAR}, | { "linear", LEVEL_LINEAR}, | |||
{ "raid0", 0}, | { "raid0", 0}, | |||
{ "0", 0}, | { "0", 0}, | |||
{ "stripe", 0}, | { "stripe", 0}, | |||
{ "raid1", 1}, | { "raid1", 1}, | |||
{ "1", 1}, | { "1", 1}, | |||
{ "mirror", 1}, | { "mirror", 1}, | |||
{ "raid4", 4}, | { "raid4", 4}, | |||
{ "4", 4}, | { "4", 4}, | |||
skipping to change at line 153 | skipping to change at line 165 | |||
mapping_t sysfs_array_states[] = { | mapping_t sysfs_array_states[] = { | |||
{ "active-idle", ARRAY_ACTIVE_IDLE }, | { "active-idle", ARRAY_ACTIVE_IDLE }, | |||
{ "active", ARRAY_ACTIVE }, | { "active", ARRAY_ACTIVE }, | |||
{ "clear", ARRAY_CLEAR }, | { "clear", ARRAY_CLEAR }, | |||
{ "inactive", ARRAY_INACTIVE }, | { "inactive", ARRAY_INACTIVE }, | |||
{ "suspended", ARRAY_SUSPENDED }, | { "suspended", ARRAY_SUSPENDED }, | |||
{ "readonly", ARRAY_READONLY }, | { "readonly", ARRAY_READONLY }, | |||
{ "read-auto", ARRAY_READ_AUTO }, | { "read-auto", ARRAY_READ_AUTO }, | |||
{ "clean", ARRAY_CLEAN }, | { "clean", ARRAY_CLEAN }, | |||
{ "write-pending", ARRAY_WRITE_PENDING }, | { "write-pending", ARRAY_WRITE_PENDING }, | |||
{ "broken", ARRAY_BROKEN }, | ||||
{ NULL, ARRAY_UNKNOWN_STATE } | { NULL, ARRAY_UNKNOWN_STATE } | |||
}; | }; | |||
char *map_num(mapping_t *map, int num) | char *map_num(mapping_t *map, int num) | |||
{ | { | |||
while (map->name) { | while (map->name) { | |||
if (map->num == num) | if (map->num == num) | |||
return map->name; | return map->name; | |||
map++; | map++; | |||
} | } | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 13 lines changed or added |