X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=mdadm.c;h=1a32328e02a1bdb1a0bdbc119acdbd4b449950e3;hb=b98043a2f8e7bb5b1918e2e02778f822f9dd4d3a;hp=d57ab957b8b23b9ee1d19c182620b3056290de90;hpb=95c5020544e245f133d9ef4cdd0931d20b51a0fe;p=thirdparty%2Fmdadm.git

diff --git a/mdadm.c b/mdadm.c
index d57ab957..1a32328e 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[])
 {
@@ -48,26 +48,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.
@@ -83,6 +73,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;
@@ -99,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;
@@ -164,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:
@@ -198,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 */
@@ -235,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;
 
@@ -276,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 {
@@ -330,16 +327,21 @@ 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);
+				pr_err("Must give one of -a/-r/-f for subsequent devices at %s\n", optarg);
 				exit(2);
 			}
 			if (devs_found > 0 && mode == GROW && !devmode) {
-				pr_err("Must give -a/--add for"
-				       " devices to add: %s\n", optarg);
+				pr_err("Must give -a/--add for devices to add: %s\n", optarg);
 				exit(2);
 			}
 			dv = xmalloc(sizeof(*dv));
@@ -365,19 +367,19 @@ 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) {
-				pr_err("chunk/rounding may only be specified once. "
-					"Second value is %s.\n", optarg);
+			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'):
@@ -412,40 +414,39 @@ 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) {
-				pr_err("size may only be specified once. "
-					"Second value is %s.\n", optarg);
+			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) {
-				pr_err("array-size may only be specified once. "
-					"Second value is %s.\n", optarg);
+			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);
@@ -453,44 +454,60 @@ 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) {
-				pr_err("raid level may only be set once.  "
-					"Second value is %s.\n", optarg);
+			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) {
-				pr_err("layout may only be sent once.  "
-				       "Second value was %s\n", optarg);
+			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;
 
@@ -498,31 +515,30 @@ int main(int argc, char *argv[])
 		case O(CREATE,Layout):
 		case O(BUILD,'p'): /* faulty layout */
 		case O(BUILD,Layout):
-			if (layout != UnSet) {
-				pr_err("layout may only be sent once.  "
-				       "Second value was %s\n", optarg);
+			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);
@@ -530,8 +546,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);
 				}
@@ -540,8 +556,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);
@@ -553,39 +569,53 @@ 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, Nodes):
+			c.nodes = parse_num(optarg);
+			if (c.nodes <= 0) {
+				pr_err("invalid number for the number of cluster nodes: %s\n",
+					optarg);
+				exit(2);
+			}
+			continue;
+		case O(CREATE, ClusterName):
+			c.homecluster = optarg;
+			if (strlen(c.homecluster) > 64) {
+				pr_err("Cluster name too big.\n");
+				exit(ERANGE);
+			}
 			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);
@@ -631,8 +661,7 @@ int main(int argc, char *argv[])
 		case O(CREATE,'u'): /* uuid of array */
 		case O(ASSEMBLE,'u'): /* uuid of array */
 			if (ident.uuid_set) {
-				pr_err("uuid cannot be set twice.  "
-					"Second value %s.\n", optarg);
+				pr_err("uuid cannot be set twice.  Second value %s.\n", optarg);
 				exit(2);
 			}
 			if (parse_uuid(optarg, ident.uuid))
@@ -647,8 +676,7 @@ int main(int argc, char *argv[])
 		case O(ASSEMBLE,'N'):
 		case O(MISC,'N'):
 			if (ident.name[0]) {
-				pr_err("name cannot be set twice.   "
-					"Second value %s.\n", optarg);
+				pr_err("name cannot be set twice.   Second value %s.\n", optarg);
 				exit(2);
 			}
 			if (mode == MISC && !c.subarray) {
@@ -666,8 +694,7 @@ int main(int argc, char *argv[])
 		case O(ASSEMBLE,'m'): /* super-minor for array */
 		case O(ASSEMBLE,SuperMinor):
 			if (ident.super_minor != UnSet) {
-				pr_err("super-minor cannot be set twice.  "
-					"Second value: %s.\n", optarg);
+				pr_err("super-minor cannot be set twice.  Second value: %s.\n", optarg);
 				exit(2);
 			}
 			if (strcmp(optarg, "dev")==0)
@@ -690,14 +717,12 @@ int main(int argc, char *argv[])
 		case O(ASSEMBLE,'U'): /* update the superblock */
 		case O(MISC,'U'):
 			if (c.update) {
-				pr_err("Can only update one aspect"
-					" of superblock, both %s and %s given.\n",
+				pr_err("Can only update one aspect of superblock, both %s and %s given.\n",
 					c.update, optarg);
 				exit(2);
 			}
 			if (mode == MISC && !c.subarray) {
-				pr_err("Only subarrays can be"
-					" updated in misc mode\n");
+				pr_err("Only subarrays can be updated in misc mode\n");
 				exit(2);
 			}
 			c.update = optarg;
@@ -719,18 +744,24 @@ 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"
-					       " type with --update=byteorder.\n");
+					pr_err("must not set metadata type with --update=byteorder.\n");
 					exit(2);
 				}
 				for(i=0; !ss && superlist[i]; i++)
 					ss = superlist[i]->match_metadata_desc(
 						"0.swap");
 				if (!ss) {
-					pr_err("INTERNAL ERROR"
-						" cannot find 0.swap\n");
+					pr_err("INTERNAL ERROR cannot find 0.swap\n");
 					exit(2);
 				}
 
@@ -739,36 +770,37 @@ 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'):
 			/* update=devicesize is allowed with --re-add */
 			if (devmode != 'A') {
-				pr_err("--update in Manage mode only"
-					" allowed with --re-add.\n");
+				pr_err("--update in Manage mode only allowed with --re-add.\n");
 				exit(1);
 			}
 			if (c.update) {
-				pr_err("Can only update one aspect"
-					" of superblock, both %s and %s given.\n",
+				pr_err("Can only update one aspect of superblock, both %s and %s given.\n",
 					c.update, optarg);
 				exit(2);
 			}
 			c.update = optarg;
-			if (strcmp(c.update, "devicesize") != 0) {
-				pr_err("only 'devicesize' can be"
-					" updated with --re-add\n");
+			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);
 			}
 			continue;
@@ -788,9 +820,9 @@ 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);
+				pr_err("configfile cannot be set twice.  Second value is %s.\n", optarg);
 				exit(2);
 			}
 			configfile = optarg;
@@ -882,6 +914,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;
@@ -898,6 +933,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'):
@@ -927,6 +974,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'):
@@ -935,14 +983,31 @@ 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"
-						" be specified once\n");
+					pr_err("subarray can only be specified once\n");
 					exit(2);
 				}
 				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 ");
@@ -959,15 +1024,21 @@ 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) {
-				pr_err("--udev-rules must"
-				       " be the only option.\n");
+				pr_err("--udev-rules must be the only option.\n");
 			} else {
 				if (udev_filename)
-					pr_err("only specify one udev "
-						"rule filename. %s ignored.\n",
+					pr_err("only specify one udev rule filename. %s ignored.\n",
 						optarg);
 				else
 					udev_filename = optarg;
@@ -1032,18 +1103,21 @@ 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;
+			}
+			if (strcmp(optarg, "clustered")== 0) {
+				s.bitmap_file = optarg;
+				/* Set the default number of cluster nodes
+				 * to 4 if not already set by user
+				 */
+				if (c.nodes < 1)
+					c.nodes = 4;
 				continue;
 			}
 			/* probable typo */
@@ -1054,24 +1128,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);
 				}
@@ -1164,15 +1239,13 @@ int main(int argc, char *argv[])
 			/* non-existent device is OK */
 			mdfd = open_mddev(devlist->devname, 0);
 		if (mdfd == -2) {
-			pr_err("device %s exists but is not an "
-				"md array.\n", devlist->devname);
+			pr_err("device %s exists but is not an md array.\n", devlist->devname);
 			exit(1);
 		}
 		if ((int)ident.super_minor == -2) {
 			struct stat stb;
 			if (mdfd < 0) {
-				pr_err("--super-minor=dev given, and "
-					"listed device %s doesn't exist.\n",
+				pr_err("--super-minor=dev given, and listed device %s doesn't exist.\n",
 					devlist->devname);
 				exit(1);
 			}
@@ -1188,8 +1261,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");
@@ -1210,6 +1283,21 @@ int main(int argc, char *argv[])
 		c.require_homehost = 0;
 	}
 
+	if (c.homecluster == NULL && (c.nodes > 0)) {
+		c.homecluster = conf_get_homecluster();
+		if (c.homecluster == NULL)
+			rv = get_cluster_name(&c.homecluster);
+		if (rv != 0) {
+			pr_err("The md can't get cluster name\n");
+			exit(1);
+		}
+	}
+
+	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 */;
@@ -1236,8 +1324,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 &&
@@ -1297,49 +1387,59 @@ 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 (c.nodes) {
+			if (!s.bitmap_file || strcmp(s.bitmap_file, "clustered") != 0) {
+				pr_err("--nodes argument only compatible with --bitmap=clustered\n");
+				rv = 1;
+				break;
+			}
+
+			if (s.level != 1) {
+				pr_err("--bitmap=clustered is currently supported with RAID mirror only\n");
+				rv = 1;
+				break;
+			}
+		}
+
+		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') {
@@ -1355,7 +1455,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);
@@ -1368,7 +1470,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) {
@@ -1397,7 +1499,7 @@ int main(int argc, char *argv[])
 		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,34 +1507,30 @@ int main(int argc, char *argv[])
 			 */
 			struct mdinfo sra;
 			int err;
-			if (raiddisks || level != UnSet) {
-				pr_err("cannot change array size in same operation "
-					"as changing raiddisks or level.\n"
+			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);
 			if (err < 0) {
 				if (errno == E2BIG)
-					pr_err("--array-size setting"
-						" is too large.\n");
+					pr_err("--array-size setting is too large.\n");
 				else
-					pr_err("current kernel does"
-						" not support setting --array-size\n");
+					pr_err("current kernel does not support setting --array-size\n");
 				rv = 1;
 				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) {
-				pr_err("--add cannot be used with "
-					"other geometry changes in --grow mode\n");
+			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;
 				break;
 			}
@@ -1442,30 +1540,27 @@ int main(int argc, char *argv[])
 				if (rv)
 					break;
 			}
-		} else if (bitmap_file) {
-			if (size >= 0 || raiddisks || chunk ||
-			    layout_str != NULL || devs_found > 1) {
-				pr_err("--bitmap changes cannot be "
-					"used with other geometry changes "
-					"in --grow mode\n");
+		} 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");
 				rv = 1;
 				break;
 			}
 			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 +1568,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 +1581,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 +1590,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();
@@ -1523,8 +1620,7 @@ static int scan_assemble(struct supertype *ss,
 	int failures, successes;
 
 	if (conf_verify_devnames(array_list)) {
-		pr_err("Duplicate MD device names in "
-		       "conf file were found.\n");
+		pr_err("Duplicate MD device names in conf file were found.\n");
 		return 1;
 	}
 	if (devlist == NULL) {
@@ -1537,9 +1633,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;
@@ -1551,7 +1645,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) {
@@ -1611,19 +1705,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",
@@ -1657,7 +1753,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) {
@@ -1667,7 +1763,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;
@@ -1685,12 +1781,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) {
@@ -1713,6 +1810,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;
@@ -1730,14 +1829,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':
@@ -1749,3 +1865,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;
+}