shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

dmeventd: fix test for select return value

Browse Source 
Do not call read when select return -1 && EINTR.
Also check for return valuer from read() and
abort write function when unexpected error happens.
This commit is contained in:
Zdenek Kabelac 2014-08-19 14:20:22 +02:00
parent 84860fd54f
commit 6d7f260f92
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemons/dmeventd/libdevmapper-event.c
View File

@ -297,13 +297,21 @@ static int _daemon_write(struct dm_event_fifos *fifos,
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(fifos->server, &fds); FD_SET(fifos->server, &fds);
ret = select(fifos->server + 1, &fds, NULL, NULL, &tval); ret = select(fifos->server + 1, &fds, NULL, NULL, &tval);
if ((ret < 0) && (errno != EINTR)) { if (ret < 0) {
if (errno == EINTR)
continue;
log_error("Unable to talk to event daemon"); log_error("Unable to talk to event daemon");
return 0; return 0;
} }
if (ret == 0) if (ret == 0)
break; break;
ret = read(fifos->server, drainbuf, sizeof(drainbuf)); ret = read(fifos->server, drainbuf, sizeof(drainbuf));
if (ret < 0) {
if ((errno == EINTR) || (errno == EAGAIN))
continue;
log_error("Unable to talk to event daemon");
return 0;
}
} }
while (bytes < size) { while (bytes < size) {