Merge pull request #2495 from heftig/master

[thirdparty/systemd.git] / src / basic / barrier.c

diff --git a/src/basic/barrier.c b/src/basic/barrier.c
index 436ba9598910a861b59312effa26622f7cdee1c8..2da633b31188a305ad95186ce2f314e8bb6ddfd0 100644 (file)
--- a/src/basic/barrier.c
+++ b/src/basic/barrier.c
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
@@ -30,8 +28,8 @@
 #include <unistd.h>
 
 #include "barrier.h"
+#include "fd-util.h"
 #include "macro.h"
-#include "util.h"
 
 /**
  * Barriers
@@ -197,6 +195,7 @@ static bool barrier_write(Barrier *b, uint64_t buf) {
         if (barrier_i_aborted(b))
                 return false;
 
+        assert(b->me >= 0);
         do {
                 len = write(b->me, &buf, sizeof(buf));
         } while (len < 0 && IN_SET(errno, EAGAIN, EINTR));