mirror of
https://github.com/systemd/systemd
synced 2024-09-15 22:30:22 +00:00
Merge pull request #13884 from poettering/event-fd-close-fix
sd-event: don't invalidate source type on disconnect
This commit is contained in:
commit
b219d193a2
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue