r23301: merged from ctdb

diff --git a/source/lib/events/events_aio.c b/source/lib/events/events_aio.c
index afc806a2764b99d4ec610332cdd30e6184ef4c37..8cc100dede8f1cee1c0179f8583d01d230bd0027 100644 (file)
--- a/source/lib/events/events_aio.c
+++ b/source/lib/events/events_aio.c
@@ -393,6 +393,8 @@ static int aio_event_fd_destructor(struct fd_event *fde)
        struct aio_event_context *aio_ev = talloc_get_type(ev->additional_data,
                                                           struct aio_event_context);
 
+       epoll_check_reopen(aio_ev);
+
        aio_ev->num_fd_events--;
        aio_ev->destruction_count++;
 

diff --git a/source/lib/events/events_epoll.c b/source/lib/events/events_epoll.c
index 9874377141d9d6f54cf775a18806a93f1a07a994..717ea94064ac4eda1fefb4dd9e59e8cc5e40e543 100644 (file)
--- a/source/lib/events/events_epoll.c
+++ b/source/lib/events/events_epoll.c
@@ -342,6 +342,8 @@ static int epoll_event_fd_destructor(struct fd_event *fde)
        struct epoll_event_context *epoll_ev = talloc_get_type(ev->additional_data,
                                                           struct epoll_event_context);
 
+       epoll_check_reopen(epoll_ev);
+
        epoll_ev->num_fd_events--;
        epoll_ev->destruction_count++;
 

diff --git a/source/lib/events/events_standard.c b/source/lib/events/events_standard.c
index fd4b88008b1335b08ada9ef902ad4612fbe76320..8761b12873bdba66e215fa91450b3f6769e55789 100644 (file)
--- a/source/lib/events/events_standard.c
+++ b/source/lib/events/events_standard.c
@@ -379,6 +379,8 @@ static int std_event_fd_destructor(struct fd_event *fde)
        struct std_event_context *std_ev = talloc_get_type(ev->additional_data,
                                                           struct std_event_context);
 
+       epoll_check_reopen(std_ev);
+
        if (std_ev->maxfd == fde->fd) {
                std_ev->maxfd = EVENT_INVALID_MAXFD;
        }