X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=mdadm.c;h=fd64e0e31610f18c1a94822dc6dd2911f872b26d;hp=43695583637df45676e5da891c1dbd123b40026a;hb=1ade5cc15a61c6fe3084c5170934e05e9a574843;hpb=a4e8316a75e3124bd9f279348fdcb880fe58bfaa

diff --git a/mdadm.c b/mdadm.c
index 43695583..fd64e0e3 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 <neilb@suse.de>
+ * Copyright (C) 2001-2013 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,6 @@
 #include "md_p.h"
 #include <ctype.h>
 
-
 static int scan_assemble(struct supertype *ss,
 			 struct context *c,
 			 struct mddev_ident *ident);
@@ -37,8 +36,9 @@ 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);
-
+const char Name[] = "mdadm";
 
 int main(int argc, char *argv[])
 {
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 	int i;
 
 	unsigned long long array_size = 0;
+	unsigned long long data_offset = INVALID_SECTORS;
 	struct mddev_ident ident;
 	char *configfile = NULL;
 	int devmode = 0;
@@ -93,6 +94,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;
@@ -158,14 +160,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:
@@ -192,8 +188,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 */
@@ -229,6 +228,10 @@ int main(int argc, char *argv[])
 		case 'E':
 		case 'X':
 		case 'Q':
+		case ExamineBB:
+		case Dump:
+		case Restore:
+		case Action:
 			newmode = MISC;
 			break;
 
@@ -270,7 +273,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 {
@@ -324,8 +327,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);
@@ -365,7 +375,8 @@ int main(int argc, char *argv[])
 				exit(2);
 			}
 			s.chunk = parse_size(optarg);
-			if (s.chunk < 8 || (s.chunk&1)) {
+			if (s.chunk == INVALID_SECTORS ||
+			    s.chunk < 8 || (s.chunk&1)) {
 				pr_err("invalid chunk/rounding value: %s\n",
 					optarg);
 				exit(2);
@@ -406,7 +417,6 @@ int main(int argc, char *argv[])
 			writemostly = 2;
 			continue;
 
-
 		case O(GROW,'z'):
 		case O(CREATE,'z'):
 		case O(BUILD,'z'): /* size */
@@ -419,7 +429,8 @@ int main(int argc, char *argv[])
 				s.size = MAX_SIZE;
 			else {
 				s.size = parse_size(optarg);
-				if (s.size < 8) {
+				if (s.size == INVALID_SECTORS ||
+				    s.size < 8) {
 					pr_err("invalid size: %s\n",
 						optarg);
 					exit(2);
@@ -439,7 +450,8 @@ int main(int argc, char *argv[])
 				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);
@@ -447,6 +459,25 @@ 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*/
@@ -713,6 +744,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"
@@ -733,17 +772,19 @@ int main(int argc, char *argv[])
 			if (strcmp(c.update,"?") == 0 ||
 			    strcmp(c.update, "help") == 0) {
 				outf = stdout;
-				fprintf(outf, Name ": ");
+				fprintf(outf, "%s: ", Name);
 			} else {
 				outf = stderr;
 				fprintf(outf,
-					Name ": '--update=%s' is invalid.  ",
-					c.update);
+					"%s: '--update=%s' is invalid.  ",
+					Name, c.update);
 			}
 			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"
+		"     'bbl', 'no-bbl'\n"
+				);
 			exit(outf == stdout ? 0 : 2);
 
 		case O(MANAGE,'U'):
@@ -760,8 +801,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);
 			}
@@ -782,6 +825,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);
@@ -876,6 +920,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;
@@ -892,6 +939,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'):
@@ -921,6 +980,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'):
@@ -929,6 +989,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"
@@ -937,6 +1000,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 ");
@@ -953,6 +1031,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) {
@@ -1026,12 +1112,6 @@ 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 ||
@@ -1049,7 +1129,8 @@ int main(int argc, char *argv[])
 		case O(BUILD,BitmapChunk):
 		case O(CREATE,BitmapChunk): /* bitmap chunksize */
 			s.bitmap_chunk = parse_size(optarg);
-			if (s.bitmap_chunk <= 0 ||
+			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);
@@ -1204,6 +1285,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 */;
@@ -1230,8 +1316,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 &&
@@ -1325,12 +1413,10 @@ int main(int argc, char *argv[])
 			break;
 		}
 
-		rv = Create(ss, devlist->devname, s.chunk, s.level, s.layout, s.size,
-			    s.raiddisks, s.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,
-			    s.assume_clean,
-			    s.bitmap_file, s.bitmap_chunk, s.write_behind, &c);
+			    &s, &c, data_offset);
 		break;
 	case MISC:
 		if (devmode == 'E') {
@@ -1346,7 +1432,9 @@ int main(int argc, char *argv[])
 			}
 			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);
@@ -1359,7 +1447,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) {
@@ -1403,7 +1491,7 @@ int main(int argc, char *argv[])
 				rv = 1;
 				break;
 			}
-			sysfs_init(&sra, mdfd, 0);
+			sysfs_init(&sra, mdfd, NULL);
 			if (array_size == MAX_SIZE)
 				err = sysfs_set_str(&sra, NULL, "array_size", "default");
 			else
@@ -1419,7 +1507,7 @@ int main(int argc, char *argv[])
 				break;
 			}
 		}
-		if (devs_found > 1 && s.raiddisks == 0) {
+		if (devs_found > 1 && s.raiddisks == 0 && s.level == UnSet) {
 			/* must be '-a'. */
 			if (s.size > 0 || s.chunk || s.layout_str != NULL || s.bitmap_file) {
 				pr_err("--add cannot be used with "
@@ -1444,18 +1532,17 @@ int main(int argc, char *argv[])
 			}
 			if (c.delay == 0)
 				c.delay = DEFAULT_BITMAP_DELAY;
-			rv = Grow_addbitmap(devlist->devname, mdfd, s.bitmap_file,
-					    s.bitmap_chunk, c.delay, s.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 (s.size > 0 || s.raiddisks || s.layout_str != NULL
-			 || s.chunk != 0 || s.level != UnSet) {
-			rv = Grow_reshape(devlist->devname, mdfd, c.verbose, c.backup_file,
-					  s.size, s.level, s.layout_str, s.chunk, s.raiddisks,
+			 || s.chunk != 0 || s.level != UnSet
+			 || data_offset != INVALID_SECTORS) {
+			rv = Grow_reshape(devlist->devname, mdfd,
 					  devlist->next,
-					  s.assume_clean, c.force);
+					  data_offset, &c, &s);
 		} else if (array_size == 0)
 			pr_err("no changes to --grow\n");
 		break;
@@ -1464,6 +1551,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;
@@ -1472,7 +1564,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) {
@@ -1481,16 +1573,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, ss);
+		} else
+			rv = Incremental(devlist, &c, ss);
 		break;
 	case AUTODETECT:
 		autodetect();
@@ -1525,9 +1617,7 @@ static int scan_assemble(struct supertype *ss,
 			a->autof = c->autof;
 	}
 	if (map_lock(&map))
-		pr_err("%s: failed to get "
-		       "exclusive lock on mapfile\n",
-		       __func__);
+		pr_err("failed to get exclusive lock on mapfile\n");
 	do {
 		failures = 0;
 		successes = 0;
@@ -1539,7 +1629,7 @@ static int scan_assemble(struct supertype *ss,
 			if (a->devname &&
 			    strcasecmp(a->devname, "<ignore>") == 0)
 				continue;
-				
+
 			r = Assemble(ss, a->devname,
 				     a, NULL, c);
 			if (r == 0) {
@@ -1599,19 +1689,21 @@ static int misc_scan(char devmode, struct context *c)
 
 	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",
@@ -1645,7 +1737,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) {
@@ -1655,7 +1747,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;
@@ -1673,12 +1765,13 @@ 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) {
@@ -1701,6 +1794,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;
@@ -1718,14 +1813,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':
@@ -1737,3 +1849,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;
+}