X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=mdadm.c;h=be990b8a4b8063455c77a7e1393c38a3b31c936f;hb=47120ad5d762386f798213a38eb2efc80ab0b695;hp=36d327e170e4205cb83d03d4df31b073bd3611a9;hpb=171dccc81381725935af15a0a1d28de35988655d;p=thirdparty%2Fmdadm.git diff --git a/mdadm.c b/mdadm.c index 36d327e1..be990b8a 100644 --- a/mdadm.c +++ b/mdadm.c @@ -1,7 +1,7 @@ /* * mdadm - manage Linux "md" devices aka RAID arrays. * - * Copyright (C) 2001-2012 Neil Brown + * Copyright (C) 2001-2013 Neil Brown * * * This program is free software; you can redistribute it and/or modify @@ -29,18 +29,16 @@ #include "md_p.h" #include - static int scan_assemble(struct supertype *ss, struct context *c, struct mddev_ident *ident); -static int misc_scan(char devmode, int verbose, int export, int test, - char *homehost, char *prefer); +static int misc_scan(char devmode, struct context *c); static int stop_scan(int verbose); static int misc_list(struct mddev_dev *devlist, struct mddev_ident *ident, + char *dump_directory, struct supertype *ss, struct context *c); - int main(int argc, char *argv[]) { int mode = 0; @@ -49,26 +47,16 @@ int main(int argc, char *argv[]) int rv; int i; - int chunk = 0; - long long size = -1; - long long array_size = -1; - int level = UnSet; - int layout = UnSet; - char *layout_str = NULL; - int raiddisks = 0; - int sparedisks = 0; + unsigned long long array_size = 0; + unsigned long long data_offset = INVALID_SECTORS; struct mddev_ident ident; char *configfile = NULL; int devmode = 0; - int write_behind = 0; int bitmap_fd = -1; - char *bitmap_file = NULL; - int bitmap_chunk = UnSet; struct mddev_dev *devlist = NULL; struct mddev_dev **devlistend = & devlist; struct mddev_dev *dv; int devs_found = 0; - int assume_clean = 0; char *symlinks = NULL; int grow_continue = 0; /* autof indicates whether and how to create device node. @@ -84,6 +72,11 @@ int main(int argc, char *argv[]) struct context c = { .require_homehost = 1, }; + struct shape s = { + .level = UnSet, + .layout = UnSet, + .bitmap_chunk = UnSet, + }; char sys_hostname[256]; char *mailaddr = NULL; @@ -100,6 +93,7 @@ int main(int argc, char *argv[]) int rebuild_map = 0; char *remove_path = NULL; char *udev_filename = NULL; + char *dump_directory = NULL; int print_help = 0; FILE *outf; @@ -165,14 +159,8 @@ int main(int argc, char *argv[]) c.homehost = optarg; continue; - /* - * --offroot sets first char of argv[0] to @. This is used - * by systemd to signal that the task was launched from - * initrd/initramfs and should be preserved during shutdown - */ case OffRootOpt: - argv[0][0] = '@'; - __offroot = 1; + /* Silently ignore old option */ continue; case Prefer: @@ -199,8 +187,11 @@ int main(int argc, char *argv[]) break; case 'a': case Add: + case AddSpare: case 'r': case Remove: + case Replace: + case With: case 'f': case Fail: case ReAdd: /* re-add */ @@ -236,6 +227,10 @@ int main(int argc, char *argv[]) case 'E': case 'X': case 'Q': + case ExamineBB: + case Dump: + case Restore: + case Action: newmode = MISC; break; @@ -277,7 +272,7 @@ int main(int argc, char *argv[]) if (mode == MISC && devs_found) { pr_err("No action given for %s in --misc mode\n", devlist->devname); - fprintf(stderr," Action options must come before device names\n"); + cont_err("Action options must come before device names\n"); exit(2); } } else { @@ -331,8 +326,15 @@ int main(int argc, char *argv[]) continue; } if (opt == 1) { - /* an undecorated option - must be a device name. + /* an undecorated option - must be a device name. */ + + if (devs_found > 0 && devmode == DetailPlatform) { + pr_err("controller may only be specified once. %s ignored\n", + optarg); + continue; + } + if (devs_found > 0 && mode == MANAGE && !devmode) { pr_err("Must give one of -a/-r/-f" " for subsequent devices at %s\n", optarg); @@ -366,19 +368,20 @@ int main(int argc, char *argv[]) case O(CREATE,ChunkSize): case O(BUILD,'c'): /* chunk or rounding */ case O(BUILD,ChunkSize): /* chunk or rounding */ - if (chunk) { + if (s.chunk) { pr_err("chunk/rounding may only be specified once. " "Second value is %s.\n", optarg); exit(2); } - chunk = parse_size(optarg); - if (chunk < 8 || (chunk&1)) { + s.chunk = parse_size(optarg); + if (s.chunk == INVALID_SECTORS || + s.chunk < 8 || (s.chunk&1)) { pr_err("invalid chunk/rounding value: %s\n", optarg); exit(2); } /* Convert sectors to K */ - chunk /= 2; + s.chunk /= 2; continue; case O(INCREMENTAL, 'e'): @@ -413,40 +416,41 @@ int main(int argc, char *argv[]) writemostly = 2; continue; - case O(GROW,'z'): case O(CREATE,'z'): case O(BUILD,'z'): /* size */ - if (size >= 0) { + if (s.size > 0) { pr_err("size may only be specified once. " "Second value is %s.\n", optarg); exit(2); } if (strcmp(optarg, "max")==0) - size = 0; + s.size = MAX_SIZE; else { - size = parse_size(optarg); - if (size < 8) { + s.size = parse_size(optarg); + if (s.size == INVALID_SECTORS || + s.size < 8) { pr_err("invalid size: %s\n", optarg); exit(2); } /* convert sectors to K */ - size /= 2; + s.size /= 2; } continue; case O(GROW,'Z'): /* array size */ - if (array_size >= 0) { + if (array_size > 0) { pr_err("array-size may only be specified once. " "Second value is %s.\n", optarg); exit(2); } if (strcmp(optarg, "max") == 0) - array_size = 0; + array_size = MAX_SIZE; else { array_size = parse_size(optarg); - if (array_size <= 0) { + if (array_size == 0 || + array_size == INVALID_SECTORS) { pr_err("invalid array size: %s\n", optarg); exit(2); @@ -454,44 +458,63 @@ int main(int argc, char *argv[]) } continue; + case O(CREATE,DataOffset): + case O(GROW,DataOffset): + if (data_offset != INVALID_SECTORS) { + pr_err("data-offset may only be specified one. " + "Second value is %s.\n", optarg); + exit(2); + } + if (mode == CREATE && + strcmp(optarg, "variable") == 0) + data_offset = VARIABLE_OFFSET; + else + data_offset = parse_size(optarg); + if (data_offset == INVALID_SECTORS) { + pr_err("invalid data-offset: %s\n", + optarg); + exit(2); + } + continue; + case O(GROW,'l'): case O(CREATE,'l'): case O(BUILD,'l'): /* set raid level*/ - if (level != UnSet) { + if (s.level != UnSet) { pr_err("raid level may only be set once. " "Second value is %s.\n", optarg); exit(2); } - level = map_name(pers, optarg); - if (level == UnSet) { + s.level = map_name(pers, optarg); + if (s.level == UnSet) { pr_err("invalid raid level: %s\n", optarg); exit(2); } - if (level != 0 && level != LEVEL_LINEAR && level != 1 && - level != LEVEL_MULTIPATH && level != LEVEL_FAULTY && - level != 10 && + if (s.level != 0 && s.level != LEVEL_LINEAR && s.level != 1 && + s.level != LEVEL_MULTIPATH && s.level != LEVEL_FAULTY && + s.level != 10 && mode == BUILD) { pr_err("Raid level %s not permitted with --build.\n", optarg); exit(2); } - if (sparedisks > 0 && level < 1 && level >= -1) { + if (s.sparedisks > 0 && s.level < 1 && s.level >= -1) { pr_err("raid level %s is incompatible with spare-devices setting.\n", optarg); exit(2); } - ident.level = level; + ident.level = s.level; continue; case O(GROW, 'p'): /* new layout */ case O(GROW, Layout): - if (layout_str) { + if (s.layout_str) { pr_err("layout may only be sent once. " "Second value was %s\n", optarg); exit(2); } - layout_str = optarg; + s.layout_str = optarg; /* 'Grow' will parse the value */ continue; @@ -499,31 +522,31 @@ int main(int argc, char *argv[]) case O(CREATE,Layout): case O(BUILD,'p'): /* faulty layout */ case O(BUILD,Layout): - if (layout != UnSet) { + if (s.layout != UnSet) { pr_err("layout may only be sent once. " "Second value was %s\n", optarg); exit(2); } - switch(level) { + switch(s.level) { default: pr_err("layout not meaningful for %s arrays.\n", - map_num(pers, level)); + map_num(pers, s.level)); exit(2); case UnSet: pr_err("raid level must be given before layout.\n"); exit(2); case 5: - layout = map_name(r5layout, optarg); - if (layout==UnSet) { + s.layout = map_name(r5layout, optarg); + if (s.layout==UnSet) { pr_err("layout %s not understood for raid5.\n", optarg); exit(2); } break; case 6: - layout = map_name(r6layout, optarg); - if (layout==UnSet) { + s.layout = map_name(r6layout, optarg); + if (s.layout==UnSet) { pr_err("layout %s not understood for raid6.\n", optarg); exit(2); @@ -531,8 +554,8 @@ int main(int argc, char *argv[]) break; case 10: - layout = parse_layout_10(optarg); - if (layout < 0) { + s.layout = parse_layout_10(optarg); + if (s.layout < 0) { pr_err("layout for raid10 must be 'nNN', 'oNN' or 'fNN' where NN is a number, not %s\n", optarg); exit(2); } @@ -541,8 +564,8 @@ int main(int argc, char *argv[]) /* Faulty * modeNNN */ - layout = parse_layout_faulty(optarg); - if (layout == -1) { + s.layout = parse_layout_faulty(optarg); + if (s.layout == -1) { pr_err("layout %s not understood for faulty.\n", optarg); exit(2); @@ -554,39 +577,39 @@ int main(int argc, char *argv[]) case O(CREATE,AssumeClean): case O(BUILD,AssumeClean): /* assume clean */ case O(GROW,AssumeClean): - assume_clean = 1; + s.assume_clean = 1; continue; case O(GROW,'n'): case O(CREATE,'n'): case O(BUILD,'n'): /* number of raid disks */ - if (raiddisks) { + if (s.raiddisks) { pr_err("raid-devices set twice: %d and %s\n", - raiddisks, optarg); + s.raiddisks, optarg); exit(2); } - raiddisks = parse_num(optarg); - if (raiddisks <= 0) { + s.raiddisks = parse_num(optarg); + if (s.raiddisks <= 0) { pr_err("invalid number of raid devices: %s\n", optarg); exit(2); } - ident.raid_disks = raiddisks; + ident.raid_disks = s.raiddisks; continue; case O(CREATE,'x'): /* number of spare (eXtra) disks */ - if (sparedisks) { + if (s.sparedisks) { pr_err("spare-devices set twice: %d and %s\n", - sparedisks, optarg); + s.sparedisks, optarg); exit(2); } - if (level != UnSet && level <= 0 && level >= -1) { + if (s.level != UnSet && s.level <= 0 && s.level >= -1) { pr_err("spare-devices setting is incompatible with raid level %d\n", - level); + s.level); exit(2); } - sparedisks = parse_num(optarg); - if (sparedisks < 0) { + s.sparedisks = parse_num(optarg); + if (s.sparedisks < 0) { pr_err("invalid number of spare-devices: %s\n", optarg); exit(2); @@ -720,6 +743,14 @@ int main(int argc, char *argv[]) continue; if (strcmp(c.update, "no-bitmap")==0) continue; + if (strcmp(c.update, "bbl") == 0) + continue; + if (strcmp(c.update, "no-bbl") == 0) + continue; + if (strcmp(c.update, "metadata") == 0) + continue; + if (strcmp(c.update, "revert-reshape") == 0) + continue; if (strcmp(c.update, "byteorder")==0) { if (ss) { pr_err("must not set metadata" @@ -750,7 +781,7 @@ int main(int argc, char *argv[]) fprintf(outf, "Valid --update options are:\n" " 'sparc2.2', 'super-minor', 'uuid', 'name', 'resync',\n" " 'summaries', 'homehost', 'byteorder', 'devicesize',\n" - " 'no-bitmap'\n"); + " 'no-bitmap', 'metadata', 'revert-reshape'\n"); exit(outf == stdout ? 0 : 2); case O(MANAGE,'U'): @@ -767,8 +798,10 @@ int main(int argc, char *argv[]) exit(2); } c.update = optarg; - if (strcmp(c.update, "devicesize") != 0) { - pr_err("only 'devicesize' can be" + if (strcmp(c.update, "devicesize") != 0 && + strcmp(c.update, "bbl") != 0 && + strcmp(c.update, "no-bbl") != 0) { + pr_err("only 'devicesize', 'bbl' and 'no-bbl' can be" " updated with --re-add\n"); exit(2); } @@ -789,6 +822,7 @@ int main(int argc, char *argv[]) case O(MISC, ConfigFile): case O(MONITOR,'c'): case O(MONITOR,ConfigFile): + case O(CREATE,ConfigFile): if (configfile) { pr_err("configfile cannot be set twice. " "Second value is %s.\n", optarg); @@ -883,6 +917,9 @@ int main(int argc, char *argv[]) case O(MANAGE,Add): /* add a drive */ devmode = 'a'; continue; + case O(MANAGE,AddSpare): /* add drive - never re-add */ + devmode = 'S'; + continue; case O(MANAGE,ReAdd): devmode = 'A'; continue; @@ -899,6 +936,18 @@ int main(int argc, char *argv[]) * remove the device */ devmode = 'f'; continue; + case O(MANAGE,Replace): + /* Mark these devices for replacement */ + devmode = 'R'; + continue; + case O(MANAGE,With): + /* These are the replacements to use */ + if (devmode != 'R') { + pr_err("--with must follow --replace\n"); + exit(2); + } + devmode = 'W'; + continue; case O(INCREMENTAL,'R'): case O(MANAGE,'R'): case O(ASSEMBLE,'R'): @@ -928,6 +977,7 @@ int main(int argc, char *argv[]) case O(MISC,'R'): case O(MISC,'S'): case O(MISC,'X'): + case O(MISC, ExamineBB): case O(MISC,'o'): case O(MISC,'w'): case O(MISC,'W'): @@ -936,6 +986,9 @@ int main(int argc, char *argv[]) case O(MISC, DetailPlatform): case O(MISC, KillSubarray): case O(MISC, UpdateSubarray): + case O(MISC, Dump): + case O(MISC, Restore): + case O(MISC ,Action): if (opt == KillSubarray || opt == UpdateSubarray) { if (c.subarray) { pr_err("subarray can only" @@ -944,6 +997,21 @@ int main(int argc, char *argv[]) } c.subarray = optarg; } + if (opt == Action) { + if (c.action) { + pr_err("Only one --action can be specified\n"); + exit(2); + } + if (strcmp(optarg, "idle") == 0 || + strcmp(optarg, "frozen") == 0 || + strcmp(optarg, "check") == 0 || + strcmp(optarg, "repair") == 0) + c.action = optarg; + else { + pr_err("action must be one of idle, frozen, check, repair\n"); + exit(2); + } + } if (devmode && devmode != opt && (devmode == 'E' || (opt == 'E' && devmode != 'Q'))) { pr_err("--examine/-E cannot be given with "); @@ -960,6 +1028,14 @@ int main(int argc, char *argv[]) exit(2); } devmode = opt; + if (opt == Dump || opt == Restore) { + if (dump_directory != NULL) { + pr_err("dump/restore directory specified twice: %s and %s\n", + dump_directory, optarg); + exit(2); + } + dump_directory = optarg; + } continue; case O(MISC, UdevRules): if (devmode && devmode != opt) { @@ -1033,18 +1109,12 @@ int main(int argc, char *argv[]) case O(BUILD,Bitmap): case O(CREATE,'b'): case O(CREATE,Bitmap): /* here we create the bitmap */ - if (strcmp(optarg, "none") == 0) { - pr_err("'--bitmap none' only" - " supported for --grow\n"); - exit(2); - } - /* FALL THROUGH */ case O(GROW,'b'): case O(GROW,Bitmap): if (strcmp(optarg, "internal")== 0 || strcmp(optarg, "none")== 0 || strchr(optarg, '/') != NULL) { - bitmap_file = optarg; + s.bitmap_file = optarg; continue; } /* probable typo */ @@ -1055,24 +1125,25 @@ int main(int argc, char *argv[]) case O(GROW,BitmapChunk): case O(BUILD,BitmapChunk): case O(CREATE,BitmapChunk): /* bitmap chunksize */ - bitmap_chunk = parse_size(optarg); - if (bitmap_chunk <= 0 || - bitmap_chunk & (bitmap_chunk - 1)) { + s.bitmap_chunk = parse_size(optarg); + if (s.bitmap_chunk == 0 || + s.bitmap_chunk == INVALID_SECTORS || + s.bitmap_chunk & (s.bitmap_chunk - 1)) { pr_err("invalid bitmap chunksize: %s\n", optarg); exit(2); } - bitmap_chunk = bitmap_chunk * 512; + s.bitmap_chunk = s.bitmap_chunk * 512; continue; case O(GROW, WriteBehind): case O(BUILD, WriteBehind): case O(CREATE, WriteBehind): /* write-behind mode */ - write_behind = DEFAULT_MAX_WRITE_BEHIND; + s.write_behind = DEFAULT_MAX_WRITE_BEHIND; if (optarg) { - write_behind = parse_num(optarg); - if (write_behind < 0 || - write_behind > 16383) { + s.write_behind = parse_num(optarg); + if (s.write_behind < 0 || + s.write_behind > 16383) { pr_err("Invalid value for maximum outstanding write-behind writes: %s.\n\tMust be between 0 and 16383.\n", optarg); exit(2); } @@ -1189,8 +1260,8 @@ int main(int argc, char *argv[]) } } - if (raiddisks) { - if (raiddisks == 1 && !c.force && level != LEVEL_FAULTY) { + if (s.raiddisks) { + if (s.raiddisks == 1 && !c.force && s.level != LEVEL_FAULTY) { pr_err("'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"); @@ -1211,6 +1282,11 @@ int main(int argc, char *argv[]) c.require_homehost = 0; } + if (c.backup_file && data_offset != INVALID_SECTORS) { + pr_err("--backup-file and --data-offset are incompatible\n"); + exit(2); + } + if ((mode == MISC && devmode == 'E') || (mode == MONITOR && spare_sharing == 0)) /* Anyone may try this */; @@ -1221,6 +1297,10 @@ int main(int argc, char *argv[]) ident.autof = c.autof; + if (c.scan && c.verbose < 2) + /* --scan implied --brief unless -vv */ + c.brief = 1; + rv = 0; switch(mode) { case MANAGE: @@ -1233,8 +1313,10 @@ int main(int argc, char *argv[]) c.update, c.force); if (!rv && c.readonly < 0) rv = Manage_ro(devlist->devname, mdfd, c.readonly); - if (!rv && c.runstop) - rv = Manage_runstop(devlist->devname, mdfd, c.runstop, c.verbose, 0); + if (!rv && c.runstop > 0) + rv = Manage_run(devlist->devname, mdfd, &c); + if (!rv && c.runstop < 0) + rv = Manage_stop(devlist->devname, mdfd, c.verbose, 0); break; case ASSEMBLE: if (devs_found == 1 && ident.uuid_set == 0 && @@ -1294,49 +1376,44 @@ int main(int argc, char *argv[]) case BUILD: if (c.delay == 0) c.delay = DEFAULT_BITMAP_DELAY; - if (write_behind && !bitmap_file) { + if (s.write_behind && !s.bitmap_file) { pr_err("write-behind mode requires a bitmap.\n"); rv = 1; break; } - if (raiddisks == 0) { + if (s.raiddisks == 0) { pr_err("no raid-devices specified.\n"); rv = 1; break; } - if (bitmap_file) { - if (strcmp(bitmap_file, "internal")==0) { + if (s.bitmap_file) { + if (strcmp(s.bitmap_file, "internal")==0) { pr_err("'internal' bitmaps not supported with --build\n"); rv |= 1; break; } } - rv = Build(devlist->devname, chunk, level, layout, - raiddisks, devlist->next, assume_clean, - bitmap_file, bitmap_chunk, write_behind, - &c, size); + rv = Build(devlist->devname, devlist->next, &s, &c); break; case CREATE: if (c.delay == 0) c.delay = DEFAULT_BITMAP_DELAY; - if (write_behind && !bitmap_file) { + if (s.write_behind && !s.bitmap_file) { pr_err("write-behind mode requires a bitmap.\n"); rv = 1; break; } - if (raiddisks == 0) { + if (s.raiddisks == 0) { pr_err("no raid-devices specified.\n"); rv = 1; break; } - rv = Create(ss, devlist->devname, chunk, level, layout, size<0 ? 0 : size, - raiddisks, sparedisks, ident.name, - ident.uuid_set ? ident.uuid : NULL, + rv = Create(ss, devlist->devname, + ident.name, ident.uuid_set ? ident.uuid : NULL, devs_found-1, devlist->next, - assume_clean, - bitmap_file, bitmap_chunk, write_behind, &c); + &s, &c, data_offset); break; case MISC: if (devmode == 'E') { @@ -1350,19 +1427,16 @@ int main(int argc, char *argv[]) pr_err("No devices listed in %s\n", configfile?configfile:DefaultConfFile); exit(1); } - if (c.brief && c.verbose > 0) - c.brief = 2; - rv = Examine(devlist, c.scan?(c.verbose>1?0:c.verbose):c.brief, - c.export, c.scan, - c.SparcAdjust, ss, c.homehost); + rv = Examine(devlist, &c, ss); } else if (devmode == DetailPlatform) { - rv = Detail_Platform(ss ? ss->ss : NULL, ss ? c.scan : 1, c.verbose); + rv = Detail_Platform(ss ? ss->ss : NULL, ss ? c.scan : 1, + c.verbose, c.export, + devlist ? devlist->devname : NULL); } else if (devlist == NULL) { if (devmode == 'S' && c.scan) rv = stop_scan(c.verbose); else if ((devmode == 'D' || devmode == Waitclean) && c.scan) - rv = misc_scan(devmode, c.verbose, c.export, - c.test, c.homehost, c.prefer); + rv = misc_scan(devmode, &c); else if (devmode == UdevRules) rv = Write_rules(udev_filename); else { @@ -1370,7 +1444,7 @@ int main(int argc, char *argv[]) exit(2); } } else - rv = misc_list(devlist, &ident, ss, &c); + rv = misc_list(devlist, &ident, dump_directory, ss, &c); break; case MONITOR: if (!devlist && !c.scan) { @@ -1390,14 +1464,16 @@ int main(int argc, char *argv[]) else c.delay = 60; } + if (c.delay == 0) + c.delay = 60; rv= Monitor(devlist, mailaddr, program, - c.delay?c.delay:60, daemonise, c.scan, oneshot, - dosyslog, c.test, pidfile, increments, - spare_sharing, c.prefer); + &c, daemonise, oneshot, + dosyslog, pidfile, increments, + spare_sharing); break; case GROW: - if (array_size >= 0) { + if (array_size > 0) { /* alway impose array size first, independent of * anything else * Do not allow level or raid_disks changes at the @@ -1405,15 +1481,15 @@ int main(int argc, char *argv[]) */ struct mdinfo sra; int err; - if (raiddisks || level != UnSet) { + if (s.raiddisks || s.level != UnSet) { pr_err("cannot change array size in same operation " "as changing raiddisks or level.\n" " Change size first, then check that data is still intact.\n"); rv = 1; break; } - sysfs_init(&sra, mdfd, 0); - if (array_size == 0) + sysfs_init(&sra, mdfd, NULL); + if (array_size == MAX_SIZE) err = sysfs_set_str(&sra, NULL, "array_size", "default"); else err = sysfs_set_num(&sra, NULL, "array_size", array_size / 2); @@ -1428,9 +1504,9 @@ int main(int argc, char *argv[]) break; } } - if (devs_found > 1 && raiddisks == 0) { + if (devs_found > 1 && s.raiddisks == 0 && s.level == UnSet) { /* must be '-a'. */ - if (size >= 0 || chunk || layout_str != NULL || bitmap_file) { + if (s.size > 0 || s.chunk || s.layout_str != NULL || s.bitmap_file) { pr_err("--add cannot be used with " "other geometry changes in --grow mode\n"); rv = 1; @@ -1442,9 +1518,9 @@ int main(int argc, char *argv[]) if (rv) break; } - } else if (bitmap_file) { - if (size >= 0 || raiddisks || chunk || - layout_str != NULL || devs_found > 1) { + } else if (s.bitmap_file) { + if (s.size > 0 || s.raiddisks || s.chunk || + s.layout_str != NULL || devs_found > 1) { pr_err("--bitmap changes cannot be " "used with other geometry changes " "in --grow mode\n"); @@ -1453,19 +1529,18 @@ int main(int argc, char *argv[]) } if (c.delay == 0) c.delay = DEFAULT_BITMAP_DELAY; - rv = Grow_addbitmap(devlist->devname, mdfd, bitmap_file, - bitmap_chunk, c.delay, write_behind, c.force); + rv = Grow_addbitmap(devlist->devname, mdfd, &c, &s); } else if (grow_continue) rv = Grow_continue_command(devlist->devname, mdfd, c.backup_file, c.verbose); - else if (size >= 0 || raiddisks != 0 || layout_str != NULL - || chunk != 0 || level != UnSet) { - rv = Grow_reshape(devlist->devname, mdfd, c.verbose, c.backup_file, - size, level, layout_str, chunk, raiddisks, + else if (s.size > 0 || s.raiddisks || s.layout_str != NULL + || s.chunk != 0 || s.level != UnSet + || data_offset != INVALID_SECTORS) { + rv = Grow_reshape(devlist->devname, mdfd, devlist->next, - assume_clean, c.force); - } else if (array_size < 0) + data_offset, &c, &s); + } else if (array_size == 0) pr_err("no changes to --grow\n"); break; case INCREMENTAL: @@ -1473,6 +1548,11 @@ int main(int argc, char *argv[]) RebuildMap(); } if (c.scan) { + rv = 1; + if (devlist) { + pr_err("In --incremental mode, a device cannot be given with --scan.\n"); + break; + } if (c.runstop <= 0) { pr_err("--incremental --scan meaningless without --run.\n"); break; @@ -1481,7 +1561,7 @@ int main(int argc, char *argv[]) pr_err("--incremental --scan --fail not supported.\n"); break; } - rv = IncrementalScan(c.verbose); + rv = IncrementalScan(&c, NULL); } if (!devlist) { if (!rebuild_map && !c.scan) { @@ -1490,19 +1570,16 @@ int main(int argc, char *argv[]) } break; } - if (devlist->next) { - pr_err("--incremental can only handle one device.\n"); - rv = 1; - break; - } - if (devmode == 'f') + if (devmode == 'f') { + if (devlist->next) { + pr_err("'--incremental --fail' can only handle one device.\n"); + rv = 1; + break; + } rv = IncrementalRemove(devlist->devname, remove_path, c.verbose); - else - rv = Incremental(devlist->devname, c.verbose, - c.runstop, ss, c.homehost, - c.require_homehost, c.autof, - c.freeze_reshape); + } else + rv = Incremental(devlist, &c, ss); break; case AUTODETECT: autodetect(); @@ -1551,7 +1628,7 @@ static int scan_assemble(struct supertype *ss, if (a->devname && strcasecmp(a->devname, "") == 0) continue; - + r = Assemble(ss, a->devname, a, NULL, c); if (r == 0) { @@ -1598,8 +1675,7 @@ static int scan_assemble(struct supertype *ss, return rv; } -static int misc_scan(char devmode, int verbose, int export, int test, - char *homehost, char *prefer) +static int misc_scan(char devmode, struct context *c) { /* apply --detail or --wait-clean to * all devices in /proc/mdstat @@ -1608,24 +1684,25 @@ static int misc_scan(char devmode, int verbose, int export, int test, struct mdstat_ent *e; struct map_ent *map = NULL; int members; - int v = verbose>1?0:verbose+1; int rv = 0; for (members = 0; members <= 1; members++) { for (e=ms ; e ; e=e->next) { - char *name; + char *name = NULL; struct map_ent *me; + struct stat stb; int member = e->metadata_version && strncmp(e->metadata_version, "external:/", 10) == 0; if (members != member) continue; - me = map_by_devnum(&map, e->devnum); + me = map_by_devnm(&map, e->devnm); if (me && me->path && strcmp(me->path, "/unknown") != 0) name = me->path; - else - name = get_md_name(e->devnum); + if (name == NULL || + stat(name, &stb) != 0) + name = get_md_name(e->devnm); if (!name) { pr_err("cannot find device file for %s\n", @@ -1633,11 +1710,9 @@ static int misc_scan(char devmode, int verbose, int export, int test, continue; } if (devmode == 'D') - rv |= Detail(name, v, - export, test, - homehost, prefer); + rv |= Detail(name, c); else - rv |= WaitClean(name, -1, v); + rv |= WaitClean(name, -1, c->verbose); put_md_name(name); } } @@ -1661,7 +1736,7 @@ static int stop_scan(int verbose) if (!progress) last = 1; progress = 0; err = 0; for (e=ms ; e ; e=e->next) { - char *name = get_md_name(e->devnum); + char *name = get_md_name(e->devnm); int mdfd; if (!name) { @@ -1671,7 +1746,7 @@ static int stop_scan(int verbose) } mdfd = open_mddev(name, 1); if (mdfd >= 0) { - if (Manage_runstop(name, mdfd, -1, verbose, !last)) + if (Manage_stop(name, mdfd, verbose, !last)) err = 1; else progress = 1; @@ -1689,19 +1764,18 @@ static int stop_scan(int verbose) static int misc_list(struct mddev_dev *devlist, struct mddev_ident *ident, + char *dump_directory, struct supertype *ss, struct context *c) { struct mddev_dev *dv; int rv = 0; - for (dv=devlist ; dv; dv=dv->next) { + for (dv=devlist ; dv; dv=(rv & 16) ? NULL : dv->next) { int mdfd; switch(dv->disposition) { case 'D': - rv |= Detail(dv->devname, - c->brief?1+c->verbose:0, - c->export, c->test, c->homehost, c->prefer); + rv |= Detail(dv->devname, c); continue; case KillOpt: /* Zero superblock */ if (ss) @@ -1719,6 +1793,8 @@ static int misc_list(struct mddev_dev *devlist, rv |= Query(dv->devname); continue; case 'X': rv |= ExamineBitmap(dv->devname, c->brief, ss); continue; + case ExamineBB: + rv |= ExamineBadblocks(dv->devname, c->brief, ss); continue; case 'W': case WaitOpt: rv |= Wait(dv->devname); continue; @@ -1736,14 +1812,31 @@ static int misc_list(struct mddev_dev *devlist, rv |= Update_subarray(dv->devname, c->subarray, c->update, ident, c->verbose); continue; + case Dump: + rv |= Dump_metadata(dv->devname, dump_directory, c, ss); + continue; + case Restore: + rv |= Restore_metadata(dv->devname, dump_directory, c, ss, + (dv == devlist && dv->next == NULL)); + continue; + case Action: + rv |= SetAction(dv->devname, c->action); + continue; + } + if (dv->devname[0] == '/') + mdfd = open_mddev(dv->devname, 1); + else { + mdfd = open_dev(dv->devname); + if (mdfd < 0) + pr_err("Cannot open %s\n", dv->devname); } - mdfd = open_mddev(dv->devname, 1); if (mdfd>=0) { switch(dv->disposition) { case 'R': - rv |= Manage_runstop(dv->devname, mdfd, 1, c->verbose, 0); break; + c->runstop = 1; + rv |= Manage_run(dv->devname, mdfd, c); break; case 'S': - rv |= Manage_runstop(dv->devname, mdfd, -1, c->verbose, 0); break; + rv |= Manage_stop(dv->devname, mdfd, c->verbose, 0); break; case 'o': rv |= Manage_ro(dv->devname, mdfd, 1); break; case 'w': @@ -1755,3 +1848,26 @@ static int misc_list(struct mddev_dev *devlist, } return rv; } + +int SetAction(char *dev, char *action) +{ + int fd = open(dev, O_RDONLY); + struct mdinfo mdi; + if (fd < 0) { + pr_err("Couldn't open %s: %s\n", dev, strerror(errno)); + return 1; + } + sysfs_init(&mdi, fd, NULL); + close(fd); + if (!mdi.sys_name[0]) { + pr_err("%s is no an md array\n", dev); + return 1; + } + + if (sysfs_set_str(&mdi, NULL, "sync_action", action) < 0) { + pr_err("Count not set action for %s to %s: %s\n", + dev, action, strerror(errno)); + return 1; + } + return 0; +}