X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-kmsg.c;h=0c8446a3d59b8ac0ec23c32ead48ab333bf9848b;hb=add00dfd1f050fab623f8aafd9afa1b72bc3aca1;hp=5c7c06a14ae42d04fad71196b260d77be985bf80;hpb=c0f71f469fef3f3a0822e0021085e6d165df2b46;p=elogind.git diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c index 5c7c06a14..0c8446a3d 100644 --- a/src/journal/journald-kmsg.c +++ b/src/journal/journald-kmsg.c @@ -428,8 +428,13 @@ int server_open_dev_kmsg(Server *s) { return 0; fail: - close_nointr_nofail(s->dev_kmsg_fd); - s->dev_kmsg_fd = -1; + if (s->dev_kmsg_event_source) + s->dev_kmsg_event_source = sd_event_source_unref(s->dev_kmsg_event_source); + + if (s->dev_kmsg_fd >= 0) { + close_nointr_nofail(s->dev_kmsg_fd); + s->dev_kmsg_fd = -1; + } return r; }