shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-22 22:03:43 +03:00
Code

Merge pull request #13884 from poettering/event-fd-close-fix

Browse Source 
sd-event: don't invalidate source type on disconnect
This commit is contained in:
Anita Zhang 2019-10-30 15:58:36 -07:00 committed by GitHub
commit b219d193a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsystemd/sd-event/sd-event.c
View File

@ -771,11 +771,13 @@ static void source_disconnect(sd_event_source *s) {
event = s->event; event = s->event;
s->type = _SOURCE_EVENT_SOURCE_TYPE_INVALID;
s->event = NULL; s->event = NULL;
LIST_REMOVE(sources, event->sources, s); LIST_REMOVE(sources, event->sources, s);
event->n_sources--; event->n_sources--;
/* Note that we don't invalidate the type here, since we still need it in order to close the fd or
* pidfd associated with this event source, which we'll do only on source_free(). */
if (!s->floating) if (!s->floating)
sd_event_unref(event); sd_event_unref(event);
} }