From: NeilBrown <neilb@suse.de>
Date: Tue, 21 May 2013 06:40:23 +0000 (+1000)
Subject: Grow: --backup-file and --data-offset are incompatible.
X-Git-Tag: mdadm-3.3-rc1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8192902ff75725e40e1b3d7d39452fd949f2d705;p=thirdparty%2Fmdadm.git

Grow: --backup-file and --data-offset are incompatible.

So report if both are given, and if --backup-file is given,
don't try to update data-offset.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Grow.c b/Grow.c
index 5d35e320..8794f4ec 100644
--- a/Grow.c
+++ b/Grow.c
@@ -2866,9 +2866,10 @@ started:
 		goto release;
 	}
 
-	switch(set_new_data_offset(sra, st, devname, info->delta_disks,
-				   data_offset,
-				   reshape.min_offset_change)) {
+	if (!backup_file)
+		switch(set_new_data_offset(sra, st, devname, info->delta_disks,
+					   data_offset,
+					   reshape.min_offset_change)) {
 	case -1:
 		goto release;
 	case 0:
diff --git a/mdadm.c b/mdadm.c
index 1b272848..b0742381 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -1266,6 +1266,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 */;