* Australia
*/
+#define HAVE_STDINT_H 1
#include "mdadm.h"
-#include <openssl/sha.h> /* for SHA1 */
+#include "sha1.h"
/*
* All handling for the 0.90.0 version superblock is in
* this file.
printf(" UUID : %08x:%08x:%08x:%08x", sb->set_uuid0, sb->set_uuid1,
sb->set_uuid2, sb->set_uuid3);
if (homehost) {
- unsigned char *hash = SHA1((unsigned char *)homehost,
- strlen(homehost),
- NULL);
+ char buf[20];
+ void *hash = sha1_buffer(homehost,
+ strlen(homehost),
+ buf);
if (memcmp(&sb->set_uuid2, hash, 8)==0)
printf(" (local to host %s)", homehost);
}
case 0:
case 4:
case 5:
+ case 6:
+ case 10:
printf(" Chunk Size : %dK\n", sb->chunk_size/1024);
break;
case -1:
mdp_super_t *sb = sbv;
char *c=map_num(pers, sb->level);
char devname[20];
- struct stat stb;
sprintf(devname, "/dev/md%d", sb->md_minor);
- if (stat(devname, &stb) != 0) {
- /* /dev/mdX doesn't exist, so use /dev/md/X */
- sprintf(devname, "/dev/md/%d", sb->md_minor);
- }
printf("ARRAY %s level=%s num-devices=%d UUID=",
devname,
else
printf("%08x", sb->set_uuid0);
if (homehost) {
- unsigned char *hash = SHA1((unsigned char *)homehost,
- strlen(homehost),
- NULL);
+ char buf[20];
+ void *hash = sha1_buffer(homehost,
+ strlen(homehost),
+ buf);
if (memcmp(&sb->set_uuid2, hash, 8)==0)
printf(" (local to host %s)", homehost);
}
static int match_home0(void *sbv, char *homehost)
{
mdp_super_t *sb = sbv;
- unsigned char *hash = SHA1((unsigned char *)homehost,
- strlen(homehost),
- NULL);
+ char buf[20];
+ char *hash = sha1_buffer(homehost,
+ strlen(homehost),
+ buf);
return (memcmp(&sb->set_uuid2, hash, 8)==0);
}
/* work_disks is calculated rather than read directly */
for (i=0; i < MD_SB_DISKS; i++)
if ((sb->disks[i].state & (1<<MD_DISK_SYNC)) &&
+ (sb->disks[i].raid_disk < info->array.raid_disks) &&
(sb->disks[i].state & (1<<MD_DISK_ACTIVE)) &&
!(sb->disks[i].state & (1<<MD_DISK_FAULTY)))
working ++;
} else if (i >= sb->raid_disks && sb->disks[i].number == 0)
sb->disks[i].state = 0;
}
- if (strcmp(update, "force")==0) {
+ if (strcmp(update, "force-one")==0) {
+ /* Not enough devices for a working array, so
+ * bring this one up-to-date.
+ */
__u32 ehi = sb->events_hi, elo = sb->events_lo;
sb->events_hi = (info->events>>32) & 0xFFFFFFFF;
sb->events_lo = (info->events) & 0xFFFFFFFF;
if (sb->events_hi != ehi ||
sb->events_lo != elo)
rv = 1;
+ }
+ if (strcmp(update, "force-array")==0) {
+ /* degraded array and 'force' requested, so
+ * maybe need to mark it 'clean'
+ */
if ((sb->level == 5 || sb->level == 4 || sb->level == 6) &&
(sb->state & (1 << MD_SB_CLEAN)) == 0) {
/* need to force clean */
rv = 1;
}
}
- if (strcmp(update, "newdev") == 0) {
- int d = info->disk.number;
- memset(&sb->disks[d], 0, sizeof(sb->disks[d]));
- sb->disks[d].number = d;
- sb->disks[d].major = info->disk.major;
- sb->disks[d].minor = info->disk.minor;
- sb->disks[d].raid_disk = info->disk.raid_disk;
- sb->disks[d].state = info->disk.state;
- sb->this_disk = sb->disks[d];
- }
if (strcmp(update, "grow") == 0) {
sb->raid_disks = info->array.raid_disks;
sb->nr_disks = info->array.nr_disks;
}
if (strcmp(update, "uuid") == 0) {
if (!uuid_set && homehost) {
- unsigned char *hash = SHA1((unsigned char*)homehost,
- strlen(homehost),
- NULL);
+ char buf[20];
+ char *hash = sha1_buffer(homehost,
+ strlen(homehost),
+ buf);
memcpy(info->uuid+2, hash, 8);
}
sb->set_uuid0 = info->uuid[0];
return rv;
}
-static __u64 event_super0(void *sbv)
-{
- mdp_super_t *sb = sbv;
- return md_event(sb);
-}
-
/*
* For verion-0 superblock, the homehost is 'stored' in the
* uuid. 8 bytes for a hash of the host leaving 8 bytes
if (rfd >= 0)
close(rfd);
if (homehost) {
- unsigned char *hash = SHA1((unsigned char*)homehost,
- strlen(homehost),
- NULL);
+ char buf[20];
+ char *hash = sha1_buffer(homehost,
+ strlen(homehost),
+ buf);
memcpy(&sb->set_uuid2, hash, 8);
}
if (super->state & (1<<MD_SB_BITMAP_PRESENT)) {
struct bitmap_super_s * bm = (struct bitmap_super_s*)(super+1);
if (__le32_to_cpu(bm->magic) == BITMAP_MAGIC)
- write(fd, bm, sizeof(*bm));
+ if (write(fd, bm, sizeof(*bm)) != sizeof(*bm))
+ return 5;
}
fsync(fd);
}
sb->disks[dinfo->number].state &= ~(1<<MD_DISK_FAULTY);
- sb->disks[dinfo->number].state |= (1<<MD_DISK_SYNC);
sb->this_disk = sb->disks[dinfo->number];
sb->sb_csum = calc_sb0_csum(sb);
.uuid_from_super = uuid_from_super0,
.getinfo_super = getinfo_super0,
.update_super = update_super0,
- .event_super = event_super0,
.init_super = init_super0,
.add_to_super = add_to_super0,
.store_super = store_super0,