* if runstop==run, or raiddisks diskswere used,
* RUN_ARRAY
*/
- unsigned long minsize=0, maxsize=0;
+ unsigned long long minsize=0, maxsize=0;
char *mindisc = NULL;
char *maxdisc = NULL;
int dnum;
if (md_get_version(mdfd) < 9000) {
- fprintf(stderr, Name ": Create requires md driver verison 0.90.0 or later\n");
+ fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n");
return 1;
}
- if (level == -10) {
+ if (level == UnSet) {
fprintf(stderr,
Name ": a RAID level is needed to create an array.\n");
return 1;
Name ": a number of --raid-devices must be given to create an array\n");
return 1;
}
+ if (raiddisks < 4 && level == 6) {
+ fprintf(stderr,
+ Name ": at least 4 raid-devices needed for level 6\n");
+ return 1;
+ }
+ if (raiddisks > 256 && level == 6) {
+ fprintf(stderr,
+ Name ": no more than 256 raid-devices supported for level 6\n");
+ return 1;
+ }
if (raiddisks < 2 && level >= 4) {
fprintf(stderr,
- Name ": atleast 2 raid-devices needed for level 4 or 5\n");
+ Name ": at least 2 raid-devices needed for level 4 or 5\n");
return 1;
}
if (raiddisks+sparedisks > MD_SB_DISKS) {
}
/* now set some defaults */
- if (layout == -1)
+ if (layout == UnSet)
switch(level) {
default: /* no layout */
layout = 0;
break;
+ case 10:
+ layout = 0x102; /* near=2, far=1 */
+ if (verbose)
+ fprintf(stderr,
+ Name ": layout defaults to n1\n");
+ break;
case 5:
+ case 6:
layout = map_name(r5layout, "default");
if (verbose)
fprintf(stderr,
Name ": layout defaults to %s\n", map_num(r5layout, layout));
break;
+ case LEVEL_FAULTY:
+ layout = map_name(faultylayout, "default");
+
+ if (verbose)
+ fprintf(stderr,
+ Name ": layout defaults to %s\n", map_num(faultylayout, layout));
+ break;
+ }
+
+ if (level == 10)
+ /* check layout fits in array*/
+ if ((layout&255) * ((layout>>8)&255) > raiddisks) {
+ fprintf(stderr, Name ": that layout requires at least %d devices\n",
+ (layout&255) * ((layout>>8)&255));
+ return 1;
}
switch(level) {
case 4:
case 5:
+ case 10:
+ case 6:
case 0:
case -1: /* linear */
if (chunk == 0) {
dnum = 0;
for (dv=devlist; dv; dv=dv->next, dnum++) {
char *dname = dv->devname;
- unsigned long dsize, freesize;
+ unsigned long dsize;
+ unsigned long long ldsize, freesize;
int fd;
if (strcasecmp(dname, "missing")==0) {
if (first_missing > dnum)
array.working_disks++;
if (dnum < raiddisks)
array.active_disks++;
- fd = open(dname, O_RDONLY, 0);
+ fd = open(dname, O_RDONLY|O_EXCL, 0);
if (fd <0 ) {
fprintf(stderr, Name ": Cannot open %s: %s\n",
dname, strerror(errno));
fail=1;
continue;
}
+#ifdef BLKGETSIZE64
+ if (ioctl(fd, BLKGETSIZE64, &ldsize)==0)
+ ;
+ else
+#endif
if (ioctl(fd, BLKGETSIZE, &dsize)) {
fprintf(stderr, Name ": Cannot get size of %s: %s\n",
dname, strerror(errno));
close(fd);
continue;
}
- if (dsize < MD_RESERVED_SECTORS*2) {
+ else {
+ ldsize = dsize;
+ dsize <<= 9;
+ }
+ if (ldsize < MD_RESERVED_SECTORS*2LL*512LL) {
fprintf(stderr, Name ": %s is too small: %luK\n",
- dname, dsize/2);
+ dname, (unsigned long)(ldsize>>10));
fail = 1;
close(fd);
continue;
}
- freesize = MD_NEW_SIZE_SECTORS(dsize);
+ freesize = MD_NEW_SIZE_SECTORS((ldsize>>9));
freesize /= 2;
if (size && freesize < size) {
fprintf(stderr, Name ": %s is smaller that given size."
- " %luK < %luK + superblock\n", dname, freesize, size);
+ " %lluK < %luK + superblock\n", dname, freesize, size);
fail = 1;
close(fd);
continue;
fprintf(stderr, Name ": no size and no drives given - aborting create.\n");
return 1;
}
- size = minsize;
- if (verbose && level>0)
- fprintf(stderr, Name ": size set to %luK\n", size);
+ if (level > 0) {
+ /* size is meaningful */
+ if (minsize > 0x100000000ULL) {
+ fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
+ return 1;
+ }
+ size = minsize;
+ if (verbose)
+ fprintf(stderr, Name ": size set to %luK\n", size);
+ }
}
- if (level >= 1 && ((maxsize-size)*100 > maxsize)) {
+ if (level > 0 && ((maxsize-size)*100 > maxsize)) {
fprintf(stderr, Name ": largest drive (%s) exceed size (%luK) by more than 1%%\n",
maxdisc, size);
warn = 1;
/* If this is raid5, we want to configure the last active slot
* as missing, so that a reconstruct happens (faster than re-parity)
+ * FIX: Can we do this for raid6 as well?
*/
- if (force == 0 && level == 5 && first_missing >= raiddisks) {
- insert_point = raiddisks-1;
- sparedisks++;
- array.active_disks--;
- missing_disks++;
+ if (force == 0 && first_missing >= raiddisks) {
+ switch ( level ) {
+ case 5:
+ insert_point = raiddisks-1;
+ sparedisks++;
+ array.active_disks--;
+ missing_disks++;
+ break;
+ default:
+ break;
+ }
}
/* Ok, lets try some ioctls */
*/
array.md_minor = 0;
if (fstat(mdfd, &stb)==0)
- array.md_minor = MINOR(stb.st_rdev);
+ array.md_minor = minor(stb.st_rdev);
array.not_persistent = 0;
- if (level == 5 && (insert_point < raiddisks || first_missing < raiddisks))
- array.state = 1; /* clean, but one drive will be missing */
+ /*** FIX: Need to do something about RAID-6 here ***/
+ if ( ( (level == 5) &&
+ (insert_point < raiddisks || first_missing < raiddisks) )
+ ||
+ ( level == 6 && missing_disks == 2)
+ )
+ array.state = 1; /* clean, but one+ drive will be missing */
else
array.state = 0; /* not clean, but no errors */
disk.minor = 0;
disk.state = 1; /* faulty */
} else {
- fd = open(dv->devname, O_RDONLY, 0);
+ fd = open(dv->devname, O_RDONLY|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);
- disk.major = MAJOR(stb.st_rdev);
- disk.minor = MINOR(stb.st_rdev);
+ disk.major = major(stb.st_rdev);
+ disk.minor = minor(stb.st_rdev);
close(fd);
}
if (ioctl(mdfd, ADD_NEW_DISK, &disk)) {
if (ioctl(mdfd, RUN_ARRAY, ¶m)) {
fprintf(stderr, Name ": RUN_ARRAY failed: %s\n",
strerror(errno));
+ Manage_runstop(mddev, mdfd, -1);
return 1;
}
fprintf(stderr, Name ": array %s started.\n", mddev);
projects / thirdparty / mdadm.git / blobdiff