From: mwilck@arcor.de <mwilck@arcor.de>
Date: Fri, 25 Oct 2013 10:07:36 +0000 (+0200)
Subject: monitor: don't call pselect() on deleted sysfs files
X-Git-Tag: mdadm-3.3-rc1~93
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b60d2890faa8b3dc361a163ea745380c1305c96;p=thirdparty%2Fmdadm.git

monitor: don't call pselect() on deleted sysfs files

It makes no sense to listen for events on files that have
been deleted. This happens when arrays are stopped and the
kernel removes the associated sysfs structures.

Calling pselect() on the deleted attributes may cause a storm
of wake events.

Signed-off-by: Martin Wilck <mwilck@arcor.de>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/monitor.c b/monitor.c
index e034a6a0..3cb42140 100644
--- a/monitor.c
+++ b/monitor.c
@@ -38,8 +38,17 @@ static int write_attr(char *attr, int fd)
 
 static void add_fd(fd_set *fds, int *maxfd, int fd)
 {
+	struct stat st;
 	if (fd < 0)
 		return;
+	if (fstat(fd, &st) == -1) {
+		dprintf("%s: Invalid fd %d\n", __func__, fd);
+		return;
+	}
+	if (st.st_nlink == 0) {
+		dprintf("%s: fd %d was deleted\n", __func__, fd);
+		return;
+	}
 	if (fd > *maxfd)
 		*maxfd = fd;
 	FD_SET(fd, fds);