imsm: kill "auto=" in brief_examine_super_imsm

[thirdparty/mdadm.git] / super-intel.c

diff --git a/super-intel.c b/super-intel.c
index 3415da4706935393ccef8bdfaa72b3f7a724ad1c..73fe5faae813ad08b9b4eb570c3f3491b315c443 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -89,7 +89,7 @@ struct imsm_map {
        __u8  num_members;      /* number of member disks */
        __u8  num_domains;      /* number of parity domains */
        __u8  failed_disk_num;  /* valid only when state is degraded */
-       __u8  reserved[1];
+       __u8  ddf;
        __u32 filler[7];        /* expansion area */
 #define IMSM_ORD_REBUILD (1 << 24)
        __u32 disk_ord_tbl[1];  /* disk_ord_tbl[num_members],
@@ -735,7 +735,8 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
                printf("      Signature : %x\n", __le32_to_cpu(log->signature));
                printf("    Entry Count : %d\n", __le32_to_cpu(log->entry_count));
                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));
+               printf("    First Spare : %llx\n",
+                      (unsigned long long) __le64_to_cpu(log->first_spare_lba));
        }
        for (i = 0; i < mpb->num_raid_devs; i++) {
                struct mdinfo info;
@@ -753,7 +754,7 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
        }
 }
 
-static void brief_examine_super_imsm(struct supertype *st)
+static void brief_examine_super_imsm(struct supertype *st, int verbose)
 {
        /* We just write a generic IMSM ARRAY entry */
        struct mdinfo info;
@@ -767,15 +768,14 @@ static void brief_examine_super_imsm(struct supertype *st)
 
        getinfo_super_imsm(st, &info);
        fname_from_uuid(st, &info, nbuf, ':');
-       printf("ARRAY metadata=imsm auto=md UUID=%s\n", nbuf + 5);
+       printf("ARRAY metadata=imsm 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",
+               printf("ARRAY /dev/md/%.16s container=%s member=%d UUID=%s\n",
                       dev->volume, nbuf + 5, i, nbuf1 + 5);
        }
 }
@@ -2397,19 +2397,23 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
        map->failed_disk_num = ~0;
        map->map_state = info->level ? IMSM_T_STATE_UNINITIALIZED :
                                       IMSM_T_STATE_NORMAL;
+       map->ddf = 1;
 
        if (info->level == 1 && info->raid_disks > 2) {
                fprintf(stderr, Name": imsm does not support more than 2 disks"
                                "in a raid1 volume\n");
                return 0;
        }
+
+       map->raid_level = info->level;
        if (info->level == 10) {
                map->raid_level = 1;
                map->num_domains = info->raid_disks / 2;
-       } else {
-               map->raid_level = info->level;
+       } else if (info->level == 1)
+               map->num_domains = info->raid_disks;
+       else
                map->num_domains = 1;
-       }
+
        num_data_stripes = info_to_num_data_stripes(info, map->num_domains);
        map->num_data_stripes = __cpu_to_le32(num_data_stripes);