diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-04-18 11:31:59 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2014-04-18 16:38:48 +0200 |
| commit | db0045dfc9403f1276682831ecbd4b83e2f72ebc (patch) | |
| tree | ae9da429f4461f479a720d5606fd30d9cbce9091 | |
| parent | 08e7de986cf2b4f8a05d6f1a7e996e4f298bfd1a (diff) | |
| download | lvm2-db0045dfc9403f1276682831ecbd4b83e2f72ebc.tar.gz | |
devmapper-event: always initialize timeout
Before calling select, always set all struct members of timeout.
| -rw-r--r-- | daemons/dmeventd/libdevmapper-event.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index b6e2f0d26..b8a0b90be 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -291,7 +291,6 @@ static int _daemon_write(struct dm_event_fifos *fifos, uint32_t *header = alloca(size); char *buf = (char *)header; char drainbuf[128]; - struct timeval tval = { 0, 0 }; header[0] = htonl(msg->cmd); header[1] = htonl(msg->size); @@ -299,9 +298,9 @@ static int _daemon_write(struct dm_event_fifos *fifos, /* drain the answer fifo */ while (1) { + struct timeval tval = { .tv_usec = 100 }; FD_ZERO(&fds); FD_SET(fifos->server, &fds); - tval.tv_usec = 100; ret = select(fifos->server + 1, &fds, NULL, NULL, &tval); if ((ret < 0) && (errno != EINTR)) { log_error("Unable to talk to event daemon"); |