svn commit: samba r23301 - in branches/SAMBA_4_0/source/lib/events: .

[tridge at samba.org]

Author: tridge
Date: 2007-06-02 00:32:49 +0000 (Sat, 02 Jun 2007)
New Revision: 23301

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23301

Log:

merged from ctdb

Modified:
   branches/SAMBA_4_0/source/lib/events/events_aio.c
   branches/SAMBA_4_0/source/lib/events/events_epoll.c
   branches/SAMBA_4_0/source/lib/events/events_standard.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/events/events_aio.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events/events_aio.c	2007-06-01 19:42:23 UTC (rev 23300)
+++ branches/SAMBA_4_0/source/lib/events/events_aio.c	2007-06-02 00:32:49 UTC (rev 23301)
@@ -393,6 +393,8 @@
 	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++;
 

Modified: branches/SAMBA_4_0/source/lib/events/events_epoll.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events/events_epoll.c	2007-06-01 19:42:23 UTC (rev 23300)
+++ branches/SAMBA_4_0/source/lib/events/events_epoll.c	2007-06-02 00:32:49 UTC (rev 23301)
@@ -342,6 +342,8 @@
 	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++;
 

Modified: branches/SAMBA_4_0/source/lib/events/events_standard.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events/events_standard.c	2007-06-01 19:42:23 UTC (rev 23300)
+++ branches/SAMBA_4_0/source/lib/events/events_standard.c	2007-06-02 00:32:49 UTC (rev 23301)
@@ -379,6 +379,8 @@
 	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;
 	}