int level = UnSet;
int layout = UnSet;
int raiddisks = 0;
+ int max_disks = MD_SB_DISKS;
int sparedisks = 0;
struct mddev_ident_s ident;
char *configfile = NULL;
int mdfd = -1;
+ srandom(time(0) ^ getpid());
+
ident.uuid_set=0;
ident.level = UnSet;
ident.raid_disks = UnSet;
fputs(Version, stderr);
exit(0);
- case 'v': verbose = 1;
+ case 'v': verbose++;
continue;
case 'b':
- if (mode == ASSEMBLE || mode == BUILD || mode == CREATE)
+ if (mode == ASSEMBLE || mode == BUILD || mode == CREATE || mode == GROW)
break; /* b means bitmap */
brief = 1;
continue;
fprintf(stderr, Name ": unrecognised metadata identifier: %s\n", optarg);
exit(2);
}
+ max_disks = ss->max_devs;
continue;
case O(GROW,'z'):
exit(2);
}
raiddisks = strtol(optarg, &c, 10);
- if (!optarg[0] || *c || raiddisks<=0 || raiddisks > MD_SB_DISKS) {
+ if (!optarg[0] || *c || raiddisks<=0) {
fprintf(stderr, Name ": invalid number of raid devices: %s\n",
optarg);
exit(2);
}
- if (raiddisks == 1 && !force && level != -5) {
- fprintf(stderr, Name ": '1' is an unusual number of drives for an array, so it is probably\n"
- " a mistake. If you really mean it you will need to specify --force before\n"
- " setting the number of drives.\n");
- exit(2);
- }
ident.raid_disks = raiddisks;
continue;
exit(2);
}
sparedisks = strtol(optarg, &c, 10);
- if (!optarg[0] || *c || sparedisks < 0 || sparedisks > MD_SB_DISKS - raiddisks) {
+ if (!optarg[0] || *c || sparedisks < 0) {
fprintf(stderr, Name ": invalid number of spare-devices: %s\n",
optarg);
exit(2);
continue;
case O(BUILD,'f'): /* force honouring '-n 1' */
+ case O(GROW,'f'): /* ditto */
case O(CREATE,'f'): /* force honouring of device list */
case O(ASSEMBLE,'f'): /* force assembly */
case O(MISC,'f'): /* force zero */
continue;
case O(MONITOR,'d'): /* delay in seconds */
+ case O(GROW, 'd'):
case O(BUILD,'d'): /* delay for bitmap updates */
case O(CREATE,'d'):
if (delay)
fprintf(stderr, Name ": bitmap file needed with -b in --assemble mode\n");
exit(2);
}
+ if (strcmp(optarg, "internal")==0) {
+ fprintf(stderr, Name ": there is no need to specify --bitmap when assembling arrays with internal bitmaps\n");
+ continue;
+ }
bitmap_fd = open(optarg, O_RDWR);
if (!*optarg || bitmap_fd < 0) {
fprintf(stderr, Name ": cannot open bitmap file %s: %s\n", optarg, strerror(errno));
}
ident.bitmap_fd = bitmap_fd; /* for Assemble */
continue;
+
+ case O(GROW,'b'):
case O(BUILD,'b'):
case O(CREATE,'b'): /* here we create the bitmap */
bitmap_file = optarg;
continue;
+ case O(GROW,4):
case O(BUILD,4):
case O(CREATE,4): /* bitmap chunksize */
bitmap_chunk = strtol(optarg, &c, 10);
}
}
+ if (raiddisks) {
+ if (raiddisks > max_disks) {
+ fprintf(stderr, Name ": invalid number of raid devices: %d\n",
+ raiddisks);
+ exit(2);
+ }
+ if (raiddisks == 1 && !force && level != -5) {
+ fprintf(stderr, Name ": '1' is an unusual number of drives for an array, so it is probably\n"
+ " a mistake. If you really mean it you will need to specify --force before\n"
+ " setting the number of drives.\n");
+ exit(2);
+ }
+ }
+ if (sparedisks) {
+ if ( sparedisks > max_disks - raiddisks) {
+ fprintf(stderr, Name ": invalid number of spare-devices: %d\n",
+ sparedisks);
+ exit(2);
+ }
+ }
rv = 0;
switch(mode) {
if (!rv && readonly < 0)
rv = Manage_ro(devlist->devname, mdfd, readonly);
if (!rv && runstop)
- rv = Manage_runstop(devlist->devname, mdfd, runstop);
+ rv = Manage_runstop(devlist->devname, mdfd, runstop, 0);
break;
case ASSEMBLE:
if (devs_found == 1 && ident.uuid_set == 0 &&
devlist->devname);
rv |= 1;
} else {
- mdfd = open_mddev(devlist->devname, array_ident->autof);
+ mdfd = open_mddev(devlist->devname,
+ array_ident->autof ? array_ident->autof : autof);
if (mdfd < 0)
rv |= 1;
else {
rv |= 1;
continue;
}
- mdfd = open_mddev(dv->devname, array_ident->autof);
+ mdfd = open_mddev(dv->devname,
+ array_ident->autof ?array_ident->autof : autof);
if (mdfd < 0) {
rv |= 1;
continue;
} else
for (; array_list; array_list = array_list->next) {
mdu_array_info_t array;
- mdfd = open_mddev(array_list->devname, array_list->autof);
+ mdfd = open_mddev(array_list->devname,
+ array_list->autof ? array_list->autof : autof);
if (mdfd < 0) {
rv |= 1;
continue;
if (bitmap_chunk == UnSet) bitmap_chunk = DEFAULT_BITMAP_CHUNK;
if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
if (bitmap_file) {
+ if (strcmp(bitmap_file, "internal")==0) {
+ fprintf(stderr, Name ": 'internal' bitmaps not supported with --build\n");
+ rv |= 1;
+ break;
+ }
bitmap_fd = open(bitmap_file, O_RDWR,0);
if (bitmap_fd < 0 && errno != ENOENT) {
perror(Name ": cannot create bitmap file");
bitmap_file, bitmap_chunk, delay);
break;
case CREATE:
- if (bitmap_chunk == UnSet) bitmap_chunk = DEFAULT_BITMAP_CHUNK;
if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
if (ss == NULL) {
for(i=0; !ss && superlist[i]; i++)
fprintf(stderr, Name ": No devices listed in %s\n", configfile?configfile:DefaultConfFile);
exit(1);
}
- rv = Examine(devlist, scan?!verbose:brief, scan, SparcAdjust, ss);
+ rv = Examine(devlist, scan?(verbose>1?0:verbose+1):brief, scan, SparcAdjust, ss);
} else {
if (devlist == NULL) {
- if ((devmode == 'S' ||devmode=='D') && scan) {
- /* apply to all devices in /proc/mdstat */
+ if (devmode=='D' && scan) {
+ /* apply --detail to all devices in /proc/mdstat */
struct mdstat_ent *ms = mdstat_read(0);
struct mdstat_ent *e;
- if (devmode == 'S') {
- /* reverse order so that arrays made of arrays are stopped properly */
- struct mdstat_ent *sm = NULL;
- while ((e=ms) != NULL) {
- ms = e->next;
- e->next = sm;
- sm = e;
- }
- ms = sm;
- }
for (e=ms ; e ; e=e->next) {
char *name = get_md_name(e->devnum);
e->dev);
continue;
}
- if (devmode == 'D')
- rv |= Detail(name, !verbose, test);
- else if (devmode=='S') {
+ rv |= Detail(name, verbose>1?0:verbose+1, test);
+ put_md_name(name);
+ }
+ } else if (devmode == 'S' && scan) {
+ /* apply --stop to all devices in /proc/mdstat */
+ /* Due to possible stacking of devices, repeat until
+ * nothing more can be stopped
+ */
+ int progress=1, err;
+ int last = 0;
+ do {
+ struct mdstat_ent *ms = mdstat_read(0);
+ struct mdstat_ent *e;
+
+ if (!progress) last = 1;
+ progress = 0; err = 0;
+ for (e=ms ; e ; e=e->next) {
+ char *name = get_md_name(e->devnum);
+
+ if (!name) {
+ fprintf(stderr, Name ": cannot find device file for %s\n",
+ e->dev);
+ continue;
+ }
mdfd = open_mddev(name, 0);
if (mdfd >= 0) {
- rv |= Manage_runstop(name, mdfd, -1);
+ if (Manage_runstop(name, mdfd, -1, !last))
+ err = 1;
+ else
+ progress = 1;
close(mdfd);
}
+
+ put_md_name(name);
}
- put_md_name(name);
- }
- } else {
+ } while (!last && err);
+ } else {
fprintf(stderr, Name ": No devices given.\n");
exit(2);
}
for (dv=devlist ; dv; dv=dv->next) {
switch(dv->disposition) {
case 'D':
- rv |= Detail(dv->devname, brief, test); continue;
+ rv |= Detail(dv->devname, brief?1+verbose:0, test); continue;
case 'K': /* Zero superblock */
rv |= Kill(dv->devname, force); continue;
case 'Q':
rv |= Query(dv->devname); continue;
case 'X':
- rv |= ExamineBitmap(dv->devname, brief); continue;
+ rv |= ExamineBitmap(dv->devname, brief, ss); continue;
}
mdfd = open_mddev(dv->devname, 0);
if (mdfd>=0) {
switch(dv->disposition) {
case 'R':
- rv |= Manage_runstop(dv->devname, mdfd, 1); break;
+ rv |= Manage_runstop(dv->devname, mdfd, 1, 0); break;
case 'S':
- rv |= Manage_runstop(dv->devname, mdfd, -1); break;
+ rv |= Manage_runstop(dv->devname, mdfd, -1, 0); break;
case 'o':
rv |= Manage_ro(dv->devname, mdfd, 1); break;
case 'w':
if (rv)
break;
}
- } else if ((size >= 0) + (raiddisks != 0) + (layout != UnSet) > 1) {
- fprintf(stderr, Name ": can change at most one of size, raiddisks, and layout\n");
+ } else if ((size >= 0) + (raiddisks != 0) + (layout != UnSet) + (bitmap_file != NULL)> 1) {
+ fprintf(stderr, Name ": can change at most one of size, raiddisks, bitmap, and layout\n");
rv = 1;
break;
} else if (layout != UnSet)
rv = Manage_reconfig(devlist->devname, mdfd, layout);
else if (size >= 0 || raiddisks)
rv = Manage_resize(devlist->devname, mdfd, size, raiddisks);
- else
+ else if (bitmap_file) {
+ if (delay == 0) delay = DEFAULT_BITMAP_DELAY;
+ rv = Grow_addbitmap(devlist->devname, mdfd, bitmap_file,
+ bitmap_chunk, delay);
+ } else
fprintf(stderr, Name ": no changes to --grow\n");
break;
}