X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=super-intel.c;h=6676692ff9e52b836eed6ac73212aaf30cdc6e97;hb=f2f27e63c44baac976b0022c6830393954d59fd4;hp=7f8dd3483271796a3dd5a53381f33a6c7fbf870e;hpb=47ee5a45661d30b1265b30731525a3a7f4cc7348;p=thirdparty%2Fmdadm.git diff --git a/super-intel.c b/super-intel.c index 7f8dd348..6676692f 100644 --- a/super-intel.c +++ b/super-intel.c @@ -1,7 +1,7 @@ /* * mdadm - Intel(R) Matrix Storage Manager Support * - * Copyright (C) 2002-2007 Intel Corporation + * Copyright (C) 2002-2008 Intel Corporation * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -30,9 +30,25 @@ #define MPB_SIG_LEN (strlen(MPB_SIGNATURE)) #define MPB_VERSION_RAID0 "1.0.00" #define MPB_VERSION_RAID1 "1.1.00" +#define MPB_VERSION_MANY_VOLUMES_PER_ARRAY "1.2.00" +#define MPB_VERSION_3OR4_DISK_ARRAY "1.2.01" #define MPB_VERSION_RAID5 "1.2.02" +#define MPB_VERSION_5OR6_DISK_ARRAY "1.2.04" +#define MPB_VERSION_CNG "1.2.06" +#define MPB_VERSION_ATTRIBS "1.3.00" #define MAX_SIGNATURE_LENGTH 32 #define MAX_RAID_SERIAL_LEN 16 + +#define MPB_ATTRIB_CHECKSUM_VERIFY __cpu_to_le32(0x80000000) +#define MPB_ATTRIB_PM __cpu_to_le32(0x40000000) +#define MPB_ATTRIB_2TB __cpu_to_le32(0x20000000) +#define MPB_ATTRIB_RAID0 __cpu_to_le32(0x00000001) +#define MPB_ATTRIB_RAID1 __cpu_to_le32(0x00000002) +#define MPB_ATTRIB_RAID10 __cpu_to_le32(0x00000004) +#define MPB_ATTRIB_RAID1E __cpu_to_le32(0x00000008) +#define MPB_ATTRIB_RAID5 __cpu_to_le32(0x00000010) +#define MPB_ATTRIB_RAIDCNG __cpu_to_le32(0x00000020) + #define MPB_SECTOR_CNT 418 #define IMSM_RESERVED_SECTORS 4096 @@ -42,13 +58,13 @@ struct imsm_disk { __u8 serial[MAX_RAID_SERIAL_LEN];/* 0xD8 - 0xE7 ascii serial number */ __u32 total_blocks; /* 0xE8 - 0xEB total blocks */ __u32 scsi_id; /* 0xEC - 0xEF scsi ID */ +#define SPARE_DISK __cpu_to_le32(0x01) /* Spare */ +#define CONFIGURED_DISK __cpu_to_le32(0x02) /* Member of some RaidDev */ +#define FAILED_DISK __cpu_to_le32(0x04) /* Permanent failure */ +#define USABLE_DISK __cpu_to_le32(0x08) /* Fully usable unless FAILED_DISK is set */ __u32 status; /* 0xF0 - 0xF3 */ -#define SPARE_DISK 0x01 /* Spare */ -#define CONFIGURED_DISK 0x02 /* Member of some RaidDev */ -#define FAILED_DISK 0x04 /* Permanent failure */ -#define USABLE_DISK 0x08 /* Fully usable unless FAILED_DISK is set */ - -#define IMSM_DISK_FILLERS 5 + __u32 owner_cfg_num; /* which config 0,1,2... owns this disk */ +#define IMSM_DISK_FILLERS 4 __u32 filler[IMSM_DISK_FILLERS]; /* 0xF4 - 0x107 MPB_DISK_FILLERS for future expansion */ }; @@ -61,14 +77,16 @@ struct imsm_map { __u8 map_state; /* Normal, Uninitialized, Degraded, Failed */ #define IMSM_T_STATE_NORMAL 0 #define IMSM_T_STATE_UNINITIALIZED 1 -#define IMSM_T_STATE_DEGRADED 2 /* FIXME: is this correct? */ -#define IMSM_T_STATE_FAILED 3 /* FIXME: is this correct? */ +#define IMSM_T_STATE_DEGRADED 2 +#define IMSM_T_STATE_FAILED 3 __u8 raid_level; #define IMSM_T_RAID0 0 #define IMSM_T_RAID1 1 #define IMSM_T_RAID5 5 /* since metadata version 1.2.02 ? */ __u8 num_members; /* number of member disks */ - __u8 reserved[3]; + __u8 num_domains; /* number of parity domains */ + __u8 failed_disk_num; /* valid only when state is degraded */ + __u8 reserved[1]; __u32 filler[7]; /* expansion area */ #define IMSM_ORD_REBUILD (1 << 24) __u32 disk_ord_tbl[1]; /* disk_ord_tbl[num_members], @@ -78,23 +96,50 @@ struct imsm_map { struct imsm_vol { __u32 curr_migr_unit; - __u32 reserved; + __u32 checkpoint_id; /* id to access curr_migr_unit */ __u8 migr_state; /* Normal or Migrating */ +#define MIGR_INIT 0 +#define MIGR_REBUILD 1 +#define MIGR_VERIFY 2 /* analagous to echo check > sync_action */ +#define MIGR_GEN_MIGR 3 +#define MIGR_STATE_CHANGE 4 __u8 migr_type; /* Initializing, Rebuilding, ... */ __u8 dirty; - __u8 fill[1]; - __u32 filler[5]; + __u8 fs_state; /* fast-sync state for CnG (0xff == disabled) */ + __u16 verify_errors; /* number of mismatches */ + __u16 bad_blocks; /* number of bad blocks during verify */ + __u32 filler[4]; struct imsm_map map[1]; /* here comes another one if migr_state */ } __attribute__ ((packed)); struct imsm_dev { - __u8 volume[MAX_RAID_SERIAL_LEN]; + __u8 volume[MAX_RAID_SERIAL_LEN]; __u32 size_low; __u32 size_high; +#define DEV_BOOTABLE __cpu_to_le32(0x01) +#define DEV_BOOT_DEVICE __cpu_to_le32(0x02) +#define DEV_READ_COALESCING __cpu_to_le32(0x04) +#define DEV_WRITE_COALESCING __cpu_to_le32(0x08) +#define DEV_LAST_SHUTDOWN_DIRTY __cpu_to_le32(0x10) +#define DEV_HIDDEN_AT_BOOT __cpu_to_le32(0x20) +#define DEV_CURRENTLY_HIDDEN __cpu_to_le32(0x40) +#define DEV_VERIFY_AND_FIX __cpu_to_le32(0x80) +#define DEV_MAP_STATE_UNINIT __cpu_to_le32(0x100) +#define DEV_NO_AUTO_RECOVERY __cpu_to_le32(0x200) +#define DEV_CLONE_N_GO __cpu_to_le32(0x400) +#define DEV_CLONE_MAN_SYNC __cpu_to_le32(0x800) +#define DEV_CNG_MASTER_DISK_NUM __cpu_to_le32(0x1000) __u32 status; /* Persistent RaidDev status */ __u32 reserved_blocks; /* Reserved blocks at beginning of volume */ -#define IMSM_DEV_FILLERS 12 + __u8 migr_priority; + __u8 num_sub_vols; + __u8 tid; + __u8 cng_master_disk; + __u16 cache_policy; + __u8 cng_state; + __u8 cng_sub_state; +#define IMSM_DEV_FILLERS 10 __u32 filler[IMSM_DEV_FILLERS]; struct imsm_vol vol; } __attribute__ ((packed)); @@ -213,17 +258,6 @@ struct imsm_update_add_disk { enum imsm_update_type type; }; -static int imsm_env_devname_as_serial(void) -{ - char *val = getenv("IMSM_DEVNAME_AS_SERIAL"); - - if (val && atoi(val) == 1) - return 1; - - return 0; -} - - static struct supertype *match_metadata_desc_imsm(char *arg) { struct supertype *st; @@ -282,8 +316,10 @@ static __u32 __gen_imsm_checksum(struct imsm_super *mpb) __u32 *p = (__u32 *) mpb; __u32 sum = 0; - while (end--) - sum += __le32_to_cpu(*p++); + while (end--) { + sum += __le32_to_cpu(*p); + p++; + } return sum - __le32_to_cpu(mpb->check_sum); } @@ -493,7 +529,7 @@ static __u32 imsm_reserved_sectors(struct intel_super *super, struct dl *dl) } #ifndef MDASSEMBLE -static void print_imsm_dev(struct imsm_dev *dev, int index) +static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx) { __u64 sz; int slot; @@ -501,11 +537,12 @@ static void print_imsm_dev(struct imsm_dev *dev, int index) __u32 ord; printf("\n"); - printf("[%s]:\n", dev->volume); + printf("[%.16s]:\n", dev->volume); + printf(" UUID : %s\n", uuid); printf(" RAID Level : %d\n", get_imsm_raid_level(map)); printf(" Members : %d\n", map->num_members); for (slot = 0; slot < map->num_members; slot++) - if (index == get_imsm_disk_idx(dev, slot)) + if (disk_idx== get_imsm_disk_idx(dev, slot)) break; if (slot < map->num_members) { ord = get_imsm_ord_tbl_ent(dev, slot); @@ -554,7 +591,7 @@ static void print_imsm_disk(struct imsm_super *mpb, int index, __u32 reserved) printf("\n"); snprintf(str, MAX_RAID_SERIAL_LEN + 1, "%s", disk->serial); printf(" Disk%02d Serial : %s\n", index, str); - s = __le32_to_cpu(disk->status); + s = disk->status; printf(" State :%s%s%s%s\n", s&SPARE_DISK ? " spare" : "", s&CONFIGURED_DISK ? " active" : "", s&FAILED_DISK ? " failed" : "", @@ -565,21 +602,29 @@ static void print_imsm_disk(struct imsm_super *mpb, int index, __u32 reserved) human_size(sz * 512)); } +static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info); + static void examine_super_imsm(struct supertype *st, char *homehost) { struct intel_super *super = st->sb; struct imsm_super *mpb = super->anchor; char str[MAX_SIGNATURE_LENGTH]; int i; + struct mdinfo info; + char nbuf[64]; __u32 sum; __u32 reserved = imsm_reserved_sectors(super, super->disks); + snprintf(str, MPB_SIG_LEN, "%s", mpb->sig); printf(" Magic : %s\n", str); snprintf(str, strlen(MPB_VERSION_RAID0), "%s", get_imsm_version(mpb)); printf(" Version : %s\n", get_imsm_version(mpb)); printf(" Family : %08x\n", __le32_to_cpu(mpb->family_num)); printf(" Generation : %08x\n", __le32_to_cpu(mpb->generation_num)); + getinfo_super_imsm(st, &info); + fname_from_uuid(st, &info, nbuf,'-'); + printf(" UUID : %s\n", nbuf + 5); sum = __le32_to_cpu(mpb->check_sum); printf(" Checksum : %08x %s\n", sum, __gen_imsm_checksum(mpb) == sum ? "correct" : "incorrect"); @@ -598,8 +643,15 @@ static void examine_super_imsm(struct supertype *st, char *homehost) printf(" Spare Blocks : %d\n", __le32_to_cpu(log->reserved_spare_block_count)); printf(" First Spare : %llx\n", __le64_to_cpu(log->first_spare_lba)); } - for (i = 0; i < mpb->num_raid_devs; i++) - print_imsm_dev(__get_imsm_dev(mpb, i), super->disks->index); + for (i = 0; i < mpb->num_raid_devs; i++) { + struct mdinfo info; + struct imsm_dev *dev = __get_imsm_dev(mpb, i); + + super->current_vol = i; + getinfo_super_imsm(st, &info); + fname_from_uuid(st, &info, nbuf, '-'); + print_imsm_dev(dev, nbuf + 5, super->disks->index); + } for (i = 0; i < mpb->num_disks; i++) { if (i == super->disks->index) continue; @@ -607,23 +659,41 @@ static void examine_super_imsm(struct supertype *st, char *homehost) } } -static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info); - static void brief_examine_super_imsm(struct supertype *st) { - /* We just write a generic DDF ARRAY entry - */ + /* We just write a generic IMSM ARRAY entry */ struct mdinfo info; char nbuf[64]; + char nbuf1[64]; + struct intel_super *super = st->sb; + int i; + + if (!super->anchor->num_raid_devs) + return; getinfo_super_imsm(st, &info); fname_from_uuid(st, &info, nbuf,'-'); - printf("ARRAY /dev/imsm metadata=imsm UUID=%s\n", nbuf + 5); + printf("ARRAY metadata=imsm auto=md UUID=%s\n", nbuf + 5); + for (i = 0; i < super->anchor->num_raid_devs; i++) { + struct imsm_dev *dev = get_imsm_dev(super, i); + + super->current_vol = i; + getinfo_super_imsm(st, &info); + fname_from_uuid(st, &info, nbuf1,'-'); + printf("ARRAY /dev/md/%.16s container=%s\n" + " member=%d auto=mdp UUID=%s\n", + dev->volume, nbuf + 5, i, nbuf1 + 5); + } } static void detail_super_imsm(struct supertype *st, char *homehost) { - printf("%s\n", __FUNCTION__); + struct mdinfo info; + char nbuf[64]; + + getinfo_super_imsm(st, &info); + fname_from_uuid(st, &info, nbuf,'-'); + printf("\n UUID : %s\n", nbuf + 5); } static void brief_detail_super_imsm(struct supertype *st) @@ -638,7 +708,14 @@ static void brief_detail_super_imsm(struct supertype *st) static int match_home_imsm(struct supertype *st, char *homehost) { - printf("%s\n", __FUNCTION__); + /* the imsm metadata format does not specify any host + * identification information. We return -1 since we can never + * confirm nor deny whether a given array is "meant" for this + * host. We rely on compare_super and the 'family_num' field to + * exclude member disks that do not belong, and we rely on + * mdadm.conf to specify the arrays that should be assembled. + * Auto-assembly may still pick up "foreign" arrays. + */ return -1; } @@ -811,16 +888,21 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info) __u32 reserved = imsm_reserved_sectors(super, super->disks); disk = &super->disks->disk; - info->disk.number = super->disks->index; - info->disk.raid_disk = super->disks->index; info->data_offset = __le32_to_cpu(disk->total_blocks) - reserved; info->component_size = reserved; - s = __le32_to_cpu(disk->status); + s = disk->status; info->disk.state = s & CONFIGURED_DISK ? (1 << MD_DISK_ACTIVE) : 0; info->disk.state |= s & FAILED_DISK ? (1 << MD_DISK_FAULTY) : 0; - info->disk.state |= s & USABLE_DISK ? (1 << MD_DISK_SYNC) : 0; + info->disk.state |= s & SPARE_DISK ? 0 : (1 << MD_DISK_SYNC); } - uuid_from_super_imsm(st, info->uuid); + + /* only call uuid_from_super_imsm when this disk is part of a populated container, + * ->compare_super may have updated the 'num_raid_devs' field for spares + */ + if (info->disk.state & (1 << MD_DISK_SYNC) || super->anchor->num_raid_devs) + uuid_from_super_imsm(st, info->uuid); + else + memcpy(info->uuid, uuid_match_any, sizeof(int[4])); } static int update_super_imsm(struct supertype *st, struct mdinfo *info, @@ -926,6 +1008,24 @@ static int compare_super_imsm(struct supertype *st, struct supertype *tst) */ if (first->anchor->num_raid_devs == 0 && sec->anchor->num_raid_devs > 0) { + int i; + + /* we need to copy raid device info from sec if an allocation + * fails here we don't associate the spare + */ + for (i = 0; i < sec->anchor->num_raid_devs; i++) { + first->dev_tbl[i] = malloc(sizeof(struct imsm_dev)); + if (!first->dev_tbl) { + while (--i >= 0) { + free(first->dev_tbl[i]); + first->dev_tbl[i] = NULL; + } + fprintf(stderr, "imsm: failed to associate spare\n"); + return 3; + } + *first->dev_tbl[i] = *sec->dev_tbl[i]; + } + first->anchor->num_raid_devs = sec->anchor->num_raid_devs; first->anchor->family_num = sec->anchor->family_num; } @@ -973,7 +1073,7 @@ static int imsm_read_serial(int fd, char *devname, rv = scsi_get_serial(fd, scsi_serial, sizeof(scsi_serial)); - if (rv && imsm_env_devname_as_serial()) { + if (rv && check_env("IMSM_DEVNAME_AS_SERIAL")) { memset(serial, 0, MAX_RAID_SERIAL_LEN); fd2devname(fd, (char *) serial); return 0; @@ -1079,16 +1179,13 @@ load_imsm_disk(int fd, struct intel_super *super, char *devname, int keep_fd) disk_iter = __get_imsm_disk(super->anchor, i); if (serialcmp(disk_iter->serial, dl->serial) == 0) { - __u32 status; - dl->disk = *disk_iter; - status = __le32_to_cpu(dl->disk.status); /* only set index on disks that are a member of a * populated contianer, i.e. one with raid_devs */ - if (status & FAILED_DISK) + if (dl->disk.status & FAILED_DISK) dl->index = -2; - else if (status & SPARE_DISK) + else if (dl->disk.status & SPARE_DISK) dl->index = -1; else dl->index = i; @@ -1097,6 +1194,13 @@ load_imsm_disk(int fd, struct intel_super *super, char *devname, int keep_fd) } } + /* no match, maybe a stale failed drive */ + if (i == super->anchor->num_disks && dl->index >= 0) { + dl->disk = *__get_imsm_disk(super->anchor, dl->index); + if (dl->disk.status & FAILED_DISK) + dl->index = -2; + } + if (alloc) super->disks = dl; @@ -1116,11 +1220,11 @@ static void imsm_copy_dev(struct imsm_dev *dest, struct imsm_dev *src) * * 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 + * 2/ Initialize (migr_state=1 migr_type=MIGR_INIT map0state=normal * map1state=unitialized) - * 3/ Verify (Resync) (migr_state=1 migr_type=1 map0state=normal + * 3/ Verify (Resync) (migr_state=1 migr_type=MIGR_REBUILD map0state=normal * map1state=normal) - * 4/ Rebuild (migr_state=1 migr_type=1 map0state=normal + * 4/ Rebuild (migr_state=1 migr_type=MIGR_REBUILD map0state=normal * map1state=degraded) */ static void migrate(struct imsm_dev *dev, __u8 to_state, int rebuild_resync) @@ -1396,7 +1500,6 @@ static int find_missing(struct intel_super *super) struct imsm_super *mpb = super->anchor; struct dl *dl; struct imsm_disk *disk; - __u32 status; for (i = 0; i < mpb->num_disks; i++) { disk = __get_imsm_disk(mpb, i); @@ -1408,8 +1511,7 @@ static int find_missing(struct intel_super *super) /* ok we have a 'disk' without a live entry in * super->disks */ - status = __le32_to_cpu(disk->status); - if (status & FAILED_DISK || !(status & USABLE_DISK)) + if (disk->status & FAILED_DISK || !(disk->status & USABLE_DISK)) continue; /* never mind, already marked */ dl = malloc(sizeof(*dl)); @@ -1669,7 +1771,7 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info, dev->reserved_blocks = __cpu_to_le32(0); vol = &dev->vol; vol->migr_state = 0; - vol->migr_type = 0; + vol->migr_type = MIGR_INIT; vol->dirty = 0; vol->curr_migr_unit = 0; for (i = 0; i < idx; i++) { @@ -1761,7 +1863,6 @@ static void add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk, struct dl *dl; struct imsm_dev *dev; struct imsm_map *map; - __u32 status; dev = get_imsm_dev(super, super->current_vol); map = get_imsm_map(dev, 0); @@ -1780,8 +1881,7 @@ static void add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk, super->anchor->num_disks++; } set_imsm_ord_tbl_ent(map, dk->number, dl->index); - status = CONFIGURED_DISK | USABLE_DISK; - dl->disk.status = __cpu_to_le32(status); + dl->disk.status = CONFIGURED_DISK | USABLE_DISK; /* if we are creating the first raid device update the family number */ if (super->current_vol == 0) { @@ -1802,7 +1902,7 @@ static void add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk, struct intel_super *super = st->sb; struct dl *dd; unsigned long long size; - __u32 status, id; + __u32 id; int rv; struct stat stb; @@ -1834,10 +1934,9 @@ static void add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk, get_dev_size(fd, NULL, &size); size /= 512; - status = USABLE_DISK | SPARE_DISK; serialcpy(dd->disk.serial, dd->serial); dd->disk.total_blocks = __cpu_to_le32(size); - dd->disk.status = __cpu_to_le32(status); + dd->disk.status = USABLE_DISK | SPARE_DISK; if (sysfs_disk_to_scsi_id(fd, &id) == 0) dd->disk.scsi_id = __cpu_to_le32(id); else @@ -2337,7 +2436,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st) if (d == NULL) skip = 1; - s = d ? __le32_to_cpu(d->disk.status) : 0; + s = d ? d->disk.status : 0; if (s & FAILED_DISK) skip = 1; if (!(s & USABLE_DISK)) @@ -2432,7 +2531,8 @@ static __u8 imsm_check_degraded(struct intel_super *super, struct imsm_dev *dev, * slot+1 */ int i; - int insync; + /* gcc -Os complains that this is unused */ + int insync = insync; for (i = 0; i < map->num_members; i++) { __u32 ord = get_imsm_ord_tbl_ent(dev, i); @@ -2446,8 +2546,7 @@ static __u8 imsm_check_degraded(struct intel_super *super, struct imsm_dev *dev, insync = 2; disk = get_imsm_disk(super, idx); - if (!disk || - __le32_to_cpu(disk->status) & FAILED_DISK || + if (!disk || disk->status & FAILED_DISK || ord & IMSM_ORD_REBUILD) insync--; @@ -2485,8 +2584,7 @@ static int imsm_count_failed(struct intel_super *super, struct imsm_dev *dev) int idx = ord_to_idx(ord); disk = get_imsm_disk(super, idx); - if (!disk || - __le32_to_cpu(disk->status) & FAILED_DISK || + if (!disk || disk->status & FAILED_DISK || ord & IMSM_ORD_REBUILD) failed++; } @@ -2501,7 +2599,7 @@ static int is_resyncing(struct imsm_dev *dev) if (!dev->vol.migr_state) return 0; - if (dev->vol.migr_type == 0) + if (dev->vol.migr_type == MIGR_INIT) return 1; migr_map = get_imsm_map(dev, 1); @@ -2519,7 +2617,7 @@ static int is_rebuilding(struct imsm_dev *dev) if (!dev->vol.migr_state) return 0; - if (dev->vol.migr_type == 0) + if (dev->vol.migr_type != MIGR_REBUILD) return 0; migr_map = get_imsm_map(dev, 1); @@ -2532,12 +2630,9 @@ static int is_rebuilding(struct imsm_dev *dev) static void mark_failure(struct imsm_disk *disk) { - __u32 status = __le32_to_cpu(disk->status); - - if (status & FAILED_DISK) + if (disk->status & FAILED_DISK) return; - status |= FAILED_DISK; - disk->status = __cpu_to_le32(status); + disk->status |= FAILED_DISK; disk->scsi_id = __cpu_to_le32(~(__u32)0); memmove(&disk->serial[0], &disk->serial[1], MAX_RAID_SERIAL_LEN - 1); } @@ -2585,9 +2680,10 @@ static int imsm_set_array_state(struct active_array *a, int consistent) } 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); + if (map->map_state == IMSM_T_STATE_NORMAL) + migrate(dev, IMSM_T_STATE_NORMAL, MIGR_REBUILD); + else + migrate(dev, IMSM_T_STATE_NORMAL, MIGR_INIT); super->updates_pending++; } @@ -2620,7 +2716,6 @@ static void imsm_set_disk(struct active_array *a, int n, int state) struct imsm_map *map = get_imsm_map(dev, 0); struct imsm_disk *disk; int failed; - __u32 status; __u32 ord; __u8 map_state; @@ -2637,8 +2732,7 @@ static void imsm_set_disk(struct active_array *a, int n, int state) 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)) { + if ((state & DS_FAULTY) && !(disk->status & FAILED_DISK)) { mark_failure(disk); super->updates_pending++; } @@ -2725,7 +2819,7 @@ static struct dl *imsm_readd(struct intel_super *super, int idx, struct active_a if (dl->index == i) break; - if (dl && __le32_to_cpu(dl->disk.status) & FAILED_DISK) + if (dl && dl->disk.status & FAILED_DISK) dl = NULL; if (dl) @@ -2746,7 +2840,6 @@ static struct dl *imsm_add_spare(struct intel_super *super, int slot, struct act int j; int found; __u32 array_start; - __u32 status; struct dl *dl; for (dl = super->disks; dl; dl = dl->next) { @@ -2762,11 +2855,10 @@ static struct dl *imsm_add_spare(struct intel_super *super, int slot, struct act continue; /* skip in use or failed drives */ - status = __le32_to_cpu(dl->disk.status); - if (status & FAILED_DISK || idx == dl->index) { + if (dl->disk.status & FAILED_DISK || idx == dl->index) { dprintf("%x:%x status ( %s%s)\n", dl->major, dl->minor, - status & FAILED_DISK ? "failed " : "", + dl->disk.status & FAILED_DISK ? "failed " : "", idx == dl->index ? "in use " : ""); continue; } @@ -2877,6 +2969,8 @@ static struct mdinfo *imsm_activate_spare(struct active_array *a, /* found a usable disk with enough space */ di = malloc(sizeof(*di)); + if (!di) + continue; memset(di, 0, sizeof(*di)); /* dl->index will be -1 in the case we are activating a @@ -2916,7 +3010,23 @@ static struct mdinfo *imsm_activate_spare(struct active_array *a, * disk_ord_tbl for the array */ mu = malloc(sizeof(*mu)); - mu->buf = malloc(sizeof(struct imsm_update_activate_spare) * num_spares); + if (mu) { + mu->buf = malloc(sizeof(struct imsm_update_activate_spare) * num_spares); + if (mu->buf == NULL) { + free(mu); + mu = NULL; + } + } + if (!mu) { + while (rv) { + struct mdinfo *n = rv->next; + + free(rv); + rv = n; + } + return NULL; + } + mu->space = NULL; mu->len = sizeof(struct imsm_update_activate_spare) * num_spares; mu->next = *updates; @@ -2998,7 +3108,6 @@ static void imsm_process_update(struct supertype *st, struct imsm_map *migr_map; struct active_array *a; struct imsm_disk *disk; - __u32 status; __u8 to_state; struct dl *dl; unsigned int found; @@ -3027,8 +3136,7 @@ static void imsm_process_update(struct supertype *st, 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) + if (!disk || disk->status & FAILED_DISK) failed++; } @@ -3038,15 +3146,13 @@ static void imsm_process_update(struct supertype *st, super->anchor->num_disks++; } disk = &dl->disk; - status = __le32_to_cpu(disk->status); - status |= CONFIGURED_DISK; - status &= ~SPARE_DISK; - disk->status = __cpu_to_le32(status); + disk->status |= CONFIGURED_DISK; + disk->status &= ~SPARE_DISK; /* mark rebuild */ to_state = imsm_check_degraded(super, dev, failed); map->map_state = IMSM_T_STATE_DEGRADED; - migrate(dev, to_state, 1); + migrate(dev, to_state, MIGR_REBUILD); 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); @@ -3159,13 +3265,10 @@ static void imsm_process_update(struct supertype *st, /* fix up flags */ for (i = 0; i < map->num_members; i++) { struct imsm_disk *disk; - __u32 status; disk = get_imsm_disk(super, get_imsm_disk_idx(dev, i)); - status = __le32_to_cpu(disk->status); - status |= CONFIGURED_DISK; - status &= ~SPARE_DISK; - disk->status = __cpu_to_le32(status); + disk->status |= CONFIGURED_DISK; + disk->status &= ~SPARE_DISK; } break; } @@ -3175,6 +3278,8 @@ static void imsm_process_update(struct supertype *st, * being added */ if (super->add) { struct active_array *a; + + super->updates_pending++; for (a = st->arrays; a; a = a->next) a->check_degraded = 1; }