From: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Date: Tue, 5 Jan 2016 16:16:15 +0000 (+0100)
Subject: imsm: use timeout when waiting for reshape progress
X-Git-Tag: mdadm-3.4~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ff3a780abeb5e4d97727dd213e5923f55cae28b;p=thirdparty%2Fmdadm.git

imsm: use timeout when waiting for reshape progress

Waiting for reshape progress is done by using select() on sync_completed
to block until an exception condition is signalled on the
filedescriptor. This happens when the attribute's value is updated by
the kernel, but if the array is stopped when mdadm is blocked on
select() this will never happen, because this attribute is then removed
and apparently the kernel doesn't do sysfs_notify() when removing a
sysfs attribute. So set a 3 second timeout for the sysfs_wait() call.

Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Signed-off-by: NeilBrown <neilb@suse.com>
---

diff --git a/super-intel.c b/super-intel.c
index b8368163..3b3d561a 100644
--- a/super-intel.c
+++ b/super-intel.c
@@ -10393,7 +10393,8 @@ int wait_for_reshape_imsm(struct mdinfo *sra, int ndata)
 
 	do {
 		char action[20];
-		sysfs_wait(fd, NULL);
+		int timeout = 3000;
+		sysfs_wait(fd, &timeout);
 		if (sysfs_get_str(sra, NULL, "sync_action",
 				  action, 20) > 0 &&
 				strncmp(action, "reshape", 7) != 0) {