unsigned long long bitmapsize;
mdu_array_info_t array;
- int major = BITMAP_MAJOR_HI;
+ int major_num = BITMAP_MAJOR_HI;
memset(&array, 0, sizeof(array));
if (vers < 9000) {
fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n");
return 1;
+ } else {
+ mdu_array_info_t inf;
+ memset(&inf, 0, sizeof(inf));
+ ioctl(mdfd, GET_ARRAY_INFO, &inf);
+ if (inf.working_disks != 0) {
+ fprintf(stderr, Name ": another array by this name"
+ " is already running.\n");
+ return 1;
+ }
}
if (level == UnSet) {
fprintf(stderr,
Name ": a RAID level is needed to create an array.\n");
return 1;
}
- if (raiddisks < 1) {
- fprintf(stderr,
- 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");
Name ": at least 2 raid-devices needed for level 4 or 5\n");
return 1;
}
+ if (level <= 0 && sparedisks) {
+ fprintf(stderr,
+ Name ": This level does not support spare devices\n");
+ return 1;
+ }
if (subdevs > raiddisks+sparedisks) {
fprintf(stderr, Name ": You have listed more devices (%d) than are in the array(%d)!\n", subdevs, raiddisks+sparedisks);
return 1;
fprintf(stderr, Name ": You haven't given enough devices (real or missing) to create this array\n");
return 1;
}
+ if (bitmap_file && level <= 0) {
+ fprintf(stderr, Name ": bitmaps not meaningful with level %s\n",
+ map_num(pers, level)?:"given");
+ return 1;
+ }
/* now set some defaults */
if (layout == UnSet)
case 10:
case 6:
case 0:
- case -1: /* linear */
+ case LEVEL_LINEAR: /* linear */
if (chunk == 0) {
chunk = 64;
if (verbose > 0)
fprintf(stderr, Name ": chunk size defaults to 64K\n");
}
break;
- default: /* raid1, multipath */
+ case 1:
+ case LEVEL_FAULTY:
+ case LEVEL_MULTIPATH:
if (chunk) {
chunk = 0;
if (verbose > 0)
fprintf(stderr, Name ": chunk size ignored for this level\n");
}
break;
+ default:
+ fprintf(stderr, Name ": unknown level %d\n", level);
+ return 1;
}
/* now look at the subdevs */
}
if (st->ss->major != 0 ||
st->minor_version != 90)
- fprintf(stderr, Name ": Defaulting to verion %d.%d metadata\n",
+ fprintf(stderr, Name ": Defaulting to version"
+ " %d.%d metadata\n",
st->ss->major,
st->minor_version);
}
if (level > 0 || level == LEVEL_MULTIPATH || level == LEVEL_FAULTY) {
/* size is meaningful */
if (minsize > 0x100000000ULL && st->ss->major == 0) {
- fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
+ fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
return 1;
}
size = minsize;
}
}
- /* If this is raid5, we want to configure the last active slot
+ /* If this is raid4/5, 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 (assume_clean==0 && force == 0 && first_missing >= raiddisks) {
switch ( level ) {
+ case 4:
case 5:
insert_point = raiddisks-1;
sparedisks++;
break;
}
}
-
+
+ if (level <= 0 && first_missing != subdevs * 2) {
+ fprintf(stderr,
+ Name ": This level does not support missing devices\n");
+ return 1;
+ }
+
/* Ok, lets try some ioctls */
array.level = level;
array.md_minor = minor(stb.st_rdev);
array.not_persistent = 0;
/*** FIX: Need to do something about RAID-6 here ***/
- if ( ( (level == 5) &&
+ if ( ( (level == 4 || level == 5) &&
(insert_point < raiddisks || first_missing < raiddisks) )
||
( level == 6 && missing_disks == 2)
return 1;
if (bitmap_file && vers < 9003) {
- major = BITMAP_MAJOR_HOSTENDIAN;
+ major_num = BITMAP_MAJOR_HOSTENDIAN;
#ifdef __BIG_ENDIAN
fprintf(stderr, Name ": Warning - bitmaps created on this kernel are not portable\n"
" between different architectured. Consider upgrading the Linux kernel.\n");
}
if (!st->ss->add_internal_bitmap(st, super, &bitmap_chunk,
delay, write_behind,
- bitmapsize, 1, major)) {
+ bitmapsize, 1, major_num)) {
fprintf(stderr, Name ": Given bitmap chunk size not supported.\n");
return 1;
}
inf.major_version = st->ss->major;
inf.minor_version = st->minor_version;
rv = ioctl(mdfd, SET_ARRAY_INFO, &inf);
- } else
+ } else
rv = ioctl(mdfd, SET_ARRAY_INFO, NULL);
if (rv) {
fprintf(stderr, Name ": SET_ARRAY_INFO failed for %s: %s\n",
if (bitmap_file) {
int uuid[4];
- st->ss->uuid_from_super(uuid, super);
+ st->ss->uuid_from_super(st, uuid, super);
if (CreateBitmap(bitmap_file, force, (char*)uuid, bitmap_chunk,
delay, write_behind,
bitmapsize,
- major)) {
+ major_num)) {
return 1;
}
bitmap_fd = open(bitmap_file, O_RDWR);
}
switch(pass){
case 1:
- st->ss->add_to_super(super, &disk);
+ st->ss->add_to_super(st, super, &disk);
break;
case 2:
if (disk.state == 1) break;
if (ioctl(mdfd, ADD_NEW_DISK, &disk)) {
fprintf(stderr, Name ": ADD_NEW_DISK for %s failed: %s\n",
dv->devname, strerror(errno));
- free(super);
+ st->ss->free_super(st, super);
return 1;
}
if (dv == moved_disk && dnum != insert_point) break;
}
}
- free(super);
+ st->ss->free_super(st, super);
/* param is not actually used */
if (runstop == 1 || subdevs >= raiddisks) {
projects / thirdparty / mdadm.git / blobdiff