From: NeilBrown <neilb@suse.de>
Date: Mon, 24 Jun 2013 03:04:38 +0000 (+1000)
Subject: Grow: fix two problems with new_data_offset
X-Git-Tag: mdadm-3.3-rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b397d7f3e08bdebcfce11ae9e281f93c5c4b9761;p=thirdparty%2Fmdadm.git

Grow: fix two problems with new_data_offset

1/ ignore failed devices - obviously
2/ We need to tell the kernel which direction the reshape should
   progress even if we didn't choose the particular data_offset
   to use.

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

diff --git a/Grow.c b/Grow.c
index 556bdafe..7bfb3ceb 100644
--- a/Grow.c
+++ b/Grow.c
@@ -2267,6 +2267,8 @@ static int set_new_data_offset(struct mdinfo *sra, struct supertype *st,
 		char *dn = map_dev(sd->disk.major, sd->disk.minor, 0);
 		unsigned long long new_data_offset;
 
+		if (sd->disk.state & (1<<MD_DISK_FAULTY))
+			continue;
 		if (delta_disks < 0) {
 			/* Don't need any space as array is shrinking
 			 * just move data_offset up by min
@@ -2308,9 +2310,9 @@ static int set_new_data_offset(struct mdinfo *sra, struct supertype *st,
 					dir = -1;
 				else
 					dir = 1;
-				sysfs_set_str(sra, NULL, "reshape_direction",
-					      dir == 1 ? "backwards" : "forwards");
 			}
+			sysfs_set_str(sra, NULL, "reshape_direction",
+				      dir == 1 ? "backwards" : "forwards");
 			if (dir > 0) {
 				/* Increase data offset */
 				if (after < min) {