diff options
| author | Neil Brown <neilb@suse.de> | 2008-07-12 12:27:37 +0200 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2008-07-12 12:27:37 +0200 |
| commit | b8ac1967953fea50f0ec1e1650a3a9f52e6525d8 (patch) | |
| tree | 5571de13f84fcfb82fe595960d43192e7866c66c /Assemble.c | |
| parent | Use text_version in map_file rather than major.minor. (diff) | |
| download | mdadm-b8ac1967953fea50f0ec1e1650a3a9f52e6525d8.tar.xz mdadm-b8ac1967953fea50f0ec1e1650a3a9f52e6525d8.zip | |
Remove 'major' from superswitch.
It isn't generally meaningful.
Diffstat (limited to 'Assemble.c')
| -rw-r--r-- | Assemble.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -542,8 +542,8 @@ int Assemble(struct supertype *st, char *mddev, int mdfd, == devices[devcnt].i.events && (devices[best[i]].i.disk.minor != devices[devcnt].i.disk.minor) - && st->ss->major == 0 - && info.array.level != -4) { + && st->ss == &super0 + && info.array.level != LEVEL_MULTIPATH) { /* two different devices with identical superblock. * Could be a mis-detection caused by overlapping * partitions. fail-safe. @@ -866,8 +866,8 @@ int Assemble(struct supertype *st, char *mddev, int mdfd, if ((vers % 100) >= 1) { /* can use different versions */ mdu_array_info_t inf; memset(&inf, 0, sizeof(inf)); - inf.major_version = st->ss->major; - inf.minor_version = st->minor_version; + inf.major_version = info.array.major_version; + inf.minor_version = info.array.minor_version; rv = ioctl(mdfd, SET_ARRAY_INFO, &inf); } else rv = ioctl(mdfd, SET_ARRAY_INFO, NULL); |