X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=Create.c;h=b2edc7d6e7bcada0514854cc498fe105865f9ec9;hp=59a41a66aff5a2e6b3b6dcde4d64e0e9b23deda4;hb=103f2410ec581620367d6fde67a3a62f077062a7;hpb=a931db9ed7c40eca0676794f145e3e5308b0bdd7 diff --git a/Create.c b/Create.c index 59a41a66..b2edc7d6 100644 --- a/Create.c +++ b/Create.c @@ -66,6 +66,7 @@ int Create(struct supertype *st, char *mddev, int mdfd, int second_missing = subdevs * 2; int missing_disks = 0; int insert_point = subdevs * 2; /* where to insert a missing drive */ + int total_slots; int pass; int vers; int rv; @@ -75,7 +76,8 @@ int Create(struct supertype *st, char *mddev, int mdfd, int need_mdmon = 0; unsigned long long bitmapsize; struct mdinfo *sra; - struct mdinfo info; + struct mdinfo info, *infos; + int did_default = 0; int major_num = BITMAP_MAJOR_HI; @@ -243,7 +245,7 @@ int Create(struct supertype *st, char *mddev, int mdfd, } if (st && ! st->ss->validate_geometry(st, level, layout, raiddisks, - chunk, size, NULL, NULL)) + chunk, size, NULL, NULL, verbose>=0)) return 1; /* now look at the subdevs */ @@ -279,7 +281,8 @@ int Create(struct supertype *st, char *mddev, int mdfd, st = superlist[i]->match_metadata_desc(name); if (st && !st->ss->validate_geometry (st, level, layout, raiddisks, - chunk, size, dname, &freesize)) + chunk, size, dname, &freesize, + verbose > 0)) st = NULL; } @@ -289,17 +292,15 @@ int Create(struct supertype *st, char *mddev, int mdfd, dname); exit(2); } - if (st->ss->major != 0 || + if (st->ss != &super0 || st->minor_version != 90) - fprintf(stderr, Name ": Defaulting to version" - " %d.%d metadata\n", - st->ss->major, - st->minor_version); + did_default = 1; } else { if (!st->ss->validate_geometry(st, level, layout, raiddisks, chunk, size, dname, - &freesize)) { + &freesize, + verbose > 0)) { fprintf(stderr, Name ": %s is not suitable for " @@ -356,9 +357,12 @@ int Create(struct supertype *st, char *mddev, int mdfd, } if (level > 0 || level == LEVEL_MULTIPATH || level == LEVEL_FAULTY - || (st && st->ss->external) ) { + || st->ss->external ) { /* size is meaningful */ - if (minsize > 0x100000000ULL && st->ss->major == 0) { + if (!st->ss->validate_geometry(st, level, layout, + raiddisks, + chunk, minsize, + NULL, NULL, 0)) { fprintf(stderr, Name ": devices too large for RAID level %d\n", level); return 1; } @@ -441,12 +445,16 @@ int Create(struct supertype *st, char *mddev, int mdfd, ( level == 6 && (insert_point < raiddisks || second_missing < raiddisks)) || + ( level <= 0 ) + || assume_clean - ) + ) { info.array.state = 1; /* clean, but one+ drive will be missing*/ - else + info.resync_start = ~0ULL; + } else { info.array.state = 0; /* not clean, but no errors */ - + info.resync_start = 0; + } if (level == 10) { /* for raid10, the bitmap size is the capacity of the array, * which is array.size * raid_disks / ncopies; @@ -483,7 +491,6 @@ int Create(struct supertype *st, char *mddev, int mdfd, + info.array.failed_disks; info.array.layout = layout; info.array.chunk_size = chunk*1024; - info.array.major_version = st->ss->major; if (name == NULL || *name == 0) { /* base name on mddev */ @@ -512,6 +519,31 @@ int Create(struct supertype *st, char *mddev, int mdfd, if (!st->ss->init_super(st, &info.array, size, name, homehost, uuid)) return 1; + total_slots = info.array.nr_disks; + st->ss->getinfo_super(st, &info); + + if (did_default && verbose >= 0) { + if (info.text_version[0] == '/') { + int dnum = devname2devnum(info.text_version+1); + char *path; + int mdp = get_mdp_major(); + struct mdinfo *mdi; + if (dnum > 0) + path = map_dev(MD_MAJOR, dnum, 1); + else + path = map_dev(mdp, (-1-dnum)<< 6, 1); + + mdi = sysfs_read(-1, dnum, GET_VERSION); + + fprintf(stderr, Name ": Creating array inside " + "%s container %s\n", + mdi?mdi->text_version:"managed", path); + sysfs_free(mdi); + } else + fprintf(stderr, Name ": Defaulting to version" + " %s metadata\n", info.text_version); + } + if (bitmap_file && vers < 9003) { major_num = BITMAP_MAJOR_HOSTENDIAN; #ifdef __BIG_ENDIAN @@ -539,14 +571,11 @@ int Create(struct supertype *st, char *mddev, int mdfd, if (st->ss->external) { char ver[100]; - if (st->ss->external == 1) - /* container */ - strcat(strcpy(ver, "external:"), st->ss->text_version); - else { + strcat(strcpy(ver, "external:"), + info.text_version); + if (st->ss->external && st->subarray[0]) { /* member */ - sprintf(ver, "external:/%s/%d", - devnum2devname(st->container_dev), - st->container_member); + /* When creating a member, we need to be careful * to negotiate with mdmon properly. * If it is already running, we cannot write to @@ -566,12 +595,13 @@ int Create(struct supertype *st, char *mddev, int mdfd, return 1; } if (mdmon_running(st->container_dev)) { - fprintf(stderr, Name ": mdmon already running " - "for %s - sorry\n", - devnum2devname(st->container_dev)); - return 1; - } - need_mdmon = 1; + if (verbose) + fprintf(stderr, Name ": reusing mdmon " + "for %s.\n", + devnum2devname(st->container_dev)); + st->update_tail = &st->updates; + } else + need_mdmon = 1; } if ((vers % 100) < 2 || sra == NULL || @@ -585,8 +615,8 @@ int Create(struct supertype *st, char *mddev, int mdfd, } else 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); @@ -619,6 +649,7 @@ int Create(struct supertype *st, char *mddev, int mdfd, } } + infos = malloc(sizeof(*infos) * total_slots); for (pass=1; pass <=2 ; pass++) { mddev_dev_t moved_disk = NULL; /* the disk that was moved out of the insert point */ @@ -627,58 +658,66 @@ int Create(struct supertype *st, char *mddev, int mdfd, dv=(dv->next)?(dv->next):moved_disk, dnum++) { int fd; struct stat stb; + struct mdinfo *inf = &infos[dnum]; - info.disk.number = dnum; + if (dnum >= total_slots) + abort(); if (dnum == insert_point) { moved_disk = dv; } - info.disk.raid_disk = info.disk.number; - if (info.disk.raid_disk < raiddisks) - info.disk.state = (1<writemostly) - info.disk.state |= (1<devname, "missing")==0) continue; - if (st->ss->external == 2) - fd = open(dv->devname, O_RDWR, 0); - else - fd = open(dv->devname, O_RDWR|O_EXCL,0); + switch(pass) { + case 1: + *inf = info; - if (fd < 0) { - fprintf(stderr, Name ": failed to open %s " - "after earlier success - aborting\n", - dv->devname); - return 1; - } - fstat(fd, &stb); - info.disk.major = major(stb.st_rdev); - info.disk.minor = minor(stb.st_rdev); + inf->disk.number = dnum; + inf->disk.raid_disk = dnum; + if (inf->disk.raid_disk < raiddisks) + inf->disk.state = (1<disk.state = 0; + + if (dv->writemostly) + inf->disk.state |= (1<ss->external && st->subarray[0]) + fd = open(dv->devname, O_RDWR, 0); + else + fd = open(dv->devname, O_RDWR|O_EXCL,0); + + if (fd < 0) { + fprintf(stderr, Name ": failed to open %s " + "after earlier success - aborting\n", + dv->devname); + return 1; + } + fstat(fd, &stb); + inf->disk.major = major(stb.st_rdev); + inf->disk.minor = minor(stb.st_rdev); - switch(pass){ - case 1: remove_partitions(fd); - st->ss->add_to_super(st, &info.disk, + st->ss->add_to_super(st, &inf->disk, fd, dv->devname); + st->ss->getinfo_super(st, inf); + + /* getinfo_super might have lost these ... */ + inf->disk.major = major(stb.st_rdev); + inf->disk.minor = minor(stb.st_rdev); break; case 2: - close(fd); - info.component_size = info.array.size * 2; - info.errors = 0; + inf->errors = 0; rv = 0; - if (st->ss->external) { - st->ss->getinfo_super_n(st, &info); - rv = sysfs_add_disk(sra, &info); - } else { + if (st->ss->external) + rv = sysfs_add_disk(sra, inf); + else rv = ioctl(mdfd, ADD_NEW_DISK, - &info.disk); - } + &inf->disk); + if (rv) { fprintf(stderr, Name ": ADD_NEW_DISK for %s " @@ -691,9 +730,12 @@ int Create(struct supertype *st, char *mddev, int mdfd, } if (dv == moved_disk && dnum != insert_point) break; } - if (pass == 1) + if (pass == 1) { st->ss->write_init_super(st); + flush_metadata_updates(st); + } } + free(infos); st->ss->free_super(st); /* param is not actually used */ @@ -726,8 +768,8 @@ int Create(struct supertype *st, char *mddev, int mdfd, } if (verbose >= 0) fprintf(stderr, Name ": array %s started.\n", mddev); - if (st->ss->external == 2) { - if (need_mdmon) { + if (st->ss->external && st->subarray[0]) { + if (need_mdmon && !env_no_mdmon()) { int dn = st->container_dev; int i; switch(fork()) {