From: NeilBrown <neilb@suse.de>
Date: Tue, 15 Mar 2011 05:31:20 +0000 (+1100)
Subject: Fix regression when using 'grow' to add a bitmap.
X-Git-Tag: mdadm-3.2.1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d8862cf613d671bcfbb796ca023161d2b907402;p=thirdparty%2Fmdadm.git

Fix regression when using 'grow' to add a bitmap.

When we allowed a devlist to accompany some --grow modes - but not
--bitmap - we made --bitmap always fail, in stead of fail of a device
was given to add.
As 'devs_found' includes the md device, we need to  compare against
'1'.

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

diff --git a/mdadm.c b/mdadm.c
index c44c4322..e01beec2 100644
--- a/mdadm.c
+++ b/mdadm.c
@@ -1646,7 +1646,7 @@ int main(int argc, char *argv[])
 			}
 		} else if (bitmap_file) {
 			if (size >= 0 || raiddisks || chunk ||
-			    layout_str != NULL || devs_found) {
+			    layout_str != NULL || devs_found > 1) {
 				fprintf(stderr, Name ": --bitmap changes cannot be "
 					"used with other geometry changes "
 					"in --grow mode\n");