Merge branch 'master' of git://github.com/djbw/mdadm into devel-3.0

Conflicts:
	Grow.c
	mdadm.h
	sysfs.c
Due to independent fixes for the "mdadm hangs if reshape finishes too quickly"
problem.

1 files changed, 4 insertions, 1 deletions

diff --git a/mapfile.c b/mapfile.c
index 9e973ef2..01185e6d 100644
--- a/mapfile.c
+++ b/mapfile.c
@@ -301,9 +301,12 @@ void RebuildMap(void)
 	int mdp = get_mdp_major();
 
 	for (md = mdstat ; md ; md = md->next) {
-		struct mdinfo *sra = sysfs_read(-1, md->devnum, GET_DEVS);
+		struct mdinfo *sra = sysfs_read(-1, md->devnum, GET_DEVS|SKIP_GONE_DEVS);
 		struct mdinfo *sd;
 
+		if (!sra)
+			continue;
+
 		for (sd = sra->devs ; sd ; sd = sd->next) {
 			char dn[30];
 			int dfd;