diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-05-14 00:57:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:21 -0500 |
| commit | ecc54f900fa6aaf1b97ef85b1101cf7badf33cec (patch) | |
| tree | 4985d6817c5b8e052fb4e0a3946a638697b602a0 /source4/lib/events/events_liboop.c | |
| parent | bc02bba4499b7f6c78dc5db0610fe4f4d238829a (diff) | |
| download | samba-ecc54f900fa6aaf1b97ef85b1101cf7badf33cec.tar.gz samba-ecc54f900fa6aaf1b97ef85b1101cf7badf33cec.tar.bz2 samba-ecc54f900fa6aaf1b97ef85b1101cf7badf33cec.zip | |
r22830: merged the latest lib/events updates from ctdb to Samba4. This
includes a new EVENT_FD_AUTOCLOSE flag that prevents race conditions
where code using fd events might close a fd before releasing the
struct fd_event. That causes headaches for epoll.
(This used to be commit f1ad216de13b154a1f8747a44b0970dcc47a784a)
Diffstat (limited to 'source4/lib/events/events_liboop.c')
| -rw-r--r-- | source4/lib/events/events_liboop.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/lib/events/events_liboop.c b/source4/lib/events/events_liboop.c index 96bdafd956..cc9047b4eb 100644 --- a/source4/lib/events/events_liboop.c +++ b/source4/lib/events/events_liboop.c @@ -101,6 +101,11 @@ static int oop_event_fd_destructor(struct fd_event *fde) if (fde->flags & EVENT_FD_WRITE) oop->cancel_fd(oop, fde->fd, OOP_WRITE); + if (fde->flags & EVENT_FD_AUTOCLOSE) { + close(fde->fd); + fde->fd = -1; + } + return 0; } |