summaryrefslogtreecommitdiff
path: root/ctdb/common
diff options
context:
space:
mode:
Diffstat (limited to 'ctdb/common')
-rw-r--r--ctdb/common/cmdline.c2
-rw-r--r--ctdb/common/ctdb_io.c5
-rw-r--r--ctdb/common/ctdb_logging.c2
-rw-r--r--ctdb/common/ctdb_ltdb.c2
-rw-r--r--ctdb/common/ctdb_message.c2
-rw-r--r--ctdb/common/ctdb_util.c2
-rw-r--r--ctdb/common/system_linux.c2
7 files changed, 9 insertions, 8 deletions
diff --git a/ctdb/common/cmdline.c b/ctdb/common/cmdline.c
index 38af6ebb693..145a13a81b7 100644
--- a/ctdb/common/cmdline.c
+++ b/ctdb/common/cmdline.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "lib/events/events.h"
+#include "lib/tevent/tevent.h"
#include "system/filesys.h"
#include "popt.h"
#include "../include/ctdb_client.h"
diff --git a/ctdb/common/ctdb_io.c b/ctdb/common/ctdb_io.c
index 102f0b6ac22..81f9451396b 100644
--- a/ctdb/common/ctdb_io.c
+++ b/ctdb/common/ctdb_io.c
@@ -22,7 +22,7 @@
#include "includes.h"
#include "lib/tdb/include/tdb.h"
-#include "lib/events/events.h"
+#include "lib/tevent/tevent.h"
#include "lib/util/dlinklist.h"
#include "system/network.h"
#include "system/filesys.h"
@@ -357,11 +357,12 @@ int ctdb_queue_set_fd(struct ctdb_queue *queue, int fd)
queue->fde = NULL;
if (fd != -1) {
- queue->fde = event_add_fd(queue->ctdb->ev, queue, fd, EVENT_FD_READ|EVENT_FD_AUTOCLOSE,
+ queue->fde = event_add_fd(queue->ctdb->ev, queue, fd, EVENT_FD_READ,
queue_io_handler, queue);
if (queue->fde == NULL) {
return -1;
}
+ tevent_fd_set_auto_close(queue->fde);
if (queue->out_queue) {
EVENT_FD_WRITEABLE(queue->fde);
diff --git a/ctdb/common/ctdb_logging.c b/ctdb/common/ctdb_logging.c
index 18aafa23322..4691208b9bd 100644
--- a/ctdb/common/ctdb_logging.c
+++ b/ctdb/common/ctdb_logging.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "lib/events/events.h"
+#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/time.h"
#include "../include/ctdb_private.h"
diff --git a/ctdb/common/ctdb_ltdb.c b/ctdb/common/ctdb_ltdb.c
index 6ce5c90138b..7dc28ddf993 100644
--- a/ctdb/common/ctdb_ltdb.c
+++ b/ctdb/common/ctdb_ltdb.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "lib/events/events.h"
+#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/ctdb/common/ctdb_message.c b/ctdb/common/ctdb_message.c
index 326b5572d49..03a4b55389c 100644
--- a/ctdb/common/ctdb_message.c
+++ b/ctdb/common/ctdb_message.c
@@ -21,7 +21,7 @@
protocol design and packet details
*/
#include "includes.h"
-#include "lib/events/events.h"
+#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c
index b928c7eda50..add2c3a95bd 100644
--- a/ctdb/common/ctdb_util.c
+++ b/ctdb/common/ctdb_util.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-#include "lib/events/events.h"
+#include "lib/tevent/tevent.h"
#include "lib/tdb/include/tdb.h"
#include "system/network.h"
#include "system/filesys.h"
diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c
index b8aace422ad..a498ab2d686 100644
--- a/ctdb/common/system_linux.c
+++ b/ctdb/common/system_linux.c
@@ -23,7 +23,7 @@
#include "system/filesys.h"
#include "system/wait.h"
#include "../include/ctdb_private.h"
-#include "lib/events/events.h"
+#include "lib/tevent/tevent.h"
#include <netinet/if_ether.h>
#include <netinet/ip6.h>
#include <netinet/icmp6.h>