diff options
| author | NeilBrown <neilb@suse.de> | 2009-06-02 15:28:41 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-06-02 15:28:41 +1000 |
| commit | 0bd54da30eebdd8bd7fd17ea438638e3f7840a1c (patch) | |
| tree | b20a5c21d368fa41c33b7b0dc297c3998abf2177 | |
| parent | 3b435195fc34ba447c8ca8fa2f90cd6d5ad88cdb (diff) | |
| parent | 1124b3cf29dad544e8a5aa01e5f9e94e7be1765a (diff) | |
| download | mdadm-0bd54da30eebdd8bd7fd17ea438638e3f7840a1c.tar.gz mdadm-0bd54da30eebdd8bd7fd17ea438638e3f7840a1c.tar.xz mdadm-0bd54da30eebdd8bd7fd17ea438638e3f7840a1c.zip | |
Merge branch 'master' of git://github.com/djbw/mdadm into devel-3.0
| -rw-r--r-- | super-intel.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/super-intel.c b/super-intel.c index d7383fb..73fe5fa 100644 --- a/super-intel.c +++ b/super-intel.c @@ -768,15 +768,14 @@ static void brief_examine_super_imsm(struct supertype *st, int verbose) 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); } } @@ -2405,13 +2404,16 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info, "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); |