1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-02-03 17:47:44 +03:00

some init_client cleanup

This commit is contained in:
Alasdair Kergon 2006-01-27 20:49:13 +00:00
parent 0ebe1f6dec
commit 312f866723

View File

@ -330,11 +330,11 @@ static int init_client(struct dm_event_fifos *fifos)
}
/* Anyone listening? If not, errno will be ENXIO */
if ((fifos->client = open(fifos->client_path,
while ((fifos->client = open(fifos->client_path,
O_WRONLY | O_NONBLOCK)) < 0) {
if (errno != ENXIO) {
log_error("%s: open client fifo %s\n",
__func__, fifos->client_path);
log_error("%s: Can't open client fifo %s: %s\n",
__func__, fifos->client_path, strerror(errno));
close(fifos->server);
stack;
return 0;
@ -345,17 +345,6 @@ static int init_client(struct dm_event_fifos *fifos)
stack;
return 0;
}
/* FIXME Unnecessary if daemon was started before calling this */
/* Daemon is started, retry the open */
fifos->client = open(fifos->client_path, O_WRONLY | O_NONBLOCK);
if (fifos->client < 0) {
log_error("%s: open client fifo %s\n",
__func__, fifos->client_path);
close(fifos->server);
stack;
return 0;
}
}
return 1;