Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monitor: fix for regression with container devices 

This patch fixes 2 problems introduced by commit 9a518d8: not closing a
file descriptor and ignoring container devices. Array state is always
"inactive" for containers, so we make sure that the device is not a
container by reading also the "level" sysfs entry.

Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Reviewed-by: Pawel Baldysiak <pawel.baldysiak@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Artur Paszkiewicz 2015-02-09 11:13:50 +01:00 committed by NeilBrown
parent 979b1feb09
commit 19d3ea0f0b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Monitor.c
View File

@ -483,11 +483,17 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat,
strncmp(buf,"inact",5) == 0) {
if (fd >= 0)
close(fd);
if (!st->err)
alert("DeviceDisappeared", dev, NULL, ainfo);
st->err++;
return 0;
fd = sysfs_open(st->devnm, NULL, "level");
if (fd < 0 || read(fd, buf, 10) != 0) {
if (fd >= 0)
close(fd);
if (!st->err)
alert("DeviceDisappeared", dev, NULL, ainfo);
st->err++;
return 0;
}
}
close(fd);
}
fd = open(dev, O_RDONLY);
if (fd < 0) {