Actually support --syslog

[thirdparty/mdadm.git] / super0.c

diff --git a/super0.c b/super0.c
index 0f993a25ad5b62789000f9c1c938141c580915eb..600aae028cafc047d2dfde724e3c050d1ed7b2b4 100644 (file)
--- a/super0.c
+++ b/super0.c
@@ -191,6 +191,8 @@ static void examine_super0(void *sbv, char *homehost)
        case 0:
        case 4:
        case 5:
+       case 6:
+       case 10:
                printf("     Chunk Size : %dK\n", sb->chunk_size/1024);
                break;
        case -1:
@@ -230,13 +232,8 @@ static void brief_examine_super0(void *sbv)
        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,
@@ -350,6 +347,7 @@ static void getinfo_super0(struct mdinfo *info, void *sbv)
        /* 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 ++;
@@ -413,13 +411,21 @@ static int update_super0(struct mdinfo *info, void *sbv, char *update,
                        } 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 */
@@ -436,16 +442,6 @@ static int update_super0(struct mdinfo *info, void *sbv, char *update,
                        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;
@@ -497,12 +493,6 @@ static int update_super0(struct mdinfo *info, void *sbv, char *update,
        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
@@ -647,7 +637,6 @@ static int write_init_super0(struct supertype *st, void *sbv, mdu_disk_info_t *d
        }
 
        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);
@@ -972,7 +961,6 @@ struct superswitch super0 = {
        .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,