From ee228be10c45e05d5ef5c9ed6b43175d3bf8c17b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 30 Nov 2018 21:07:21 +0100
Subject: [PATCH] util-lib: don't include fileio.h from fileio-label.h

There's no reason for doing that, hence simply don't.
---
 src/core/unit.c                    | 1 +
 src/hostname/hostnamed.c           | 1 +
 src/login/logind-dbus.c            | 1 +
 src/resolve/resolved-manager.c     | 2 +-
 src/resolve/resolved-resolv-conf.c | 1 -
 src/shared/fileio-label.h          | 8 +++-----
 src/sysusers/sysusers.c            | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/unit.c b/src/core/unit.c
index 89bb95e2f1c..d58f2eaacf4 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -22,6 +22,7 @@
 #include "execute.h"
 #include "fd-util.h"
 #include "fileio-label.h"
+#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "id128-util.h"
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index d14073ace05..bf1c00b4aa1 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -11,6 +11,7 @@
 #include "def.h"
 #include "env-util.h"
 #include "fileio-label.h"
+#include "fileio.h"
 #include "hostname-util.h"
 #include "id128-util.h"
 #include "main-func.h"
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index ab4561a555d..0858fbd96c3 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -21,6 +21,7 @@
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio-label.h"
+#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "logind.h"
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 0fdc84d57af..1b9e1435246 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -14,7 +14,7 @@
 #include "dirent-util.h"
 #include "dns-domain.h"
 #include "fd-util.h"
-#include "fileio-label.h"
+#include "fileio.h"
 #include "hostname-util.h"
 #include "io-util.h"
 #include "io-util.h"
diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index f8b5301c1ed..42225572f25 100644
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -6,7 +6,6 @@
 #include "alloc-util.h"
 #include "dns-domain.h"
 #include "fd-util.h"
-#include "fileio-label.h"
 #include "fileio.h"
 #include "ordered-set.h"
 #include "resolved-conf.h"
diff --git a/src/shared/fileio-label.h b/src/shared/fileio-label.h
index d11112debd6..2347753fe4f 100644
--- a/src/shared/fileio-label.h
+++ b/src/shared/fileio-label.h
@@ -3,11 +3,9 @@
 
 #include <stdio.h>
 
-#include "fileio.h"
-
-/* These functions are split out of fileio.h (and not for examplement just as flags to the functions they wrap) in
- * order to optimize linking: This way, -lselinux is needed only for the callers of these functions that need selinux,
- * but not for all */
+/* These functions are split out of fileio.h (and not for example just flags to the functions they wrap) in order to
+ * optimize linking: This way, -lselinux is needed only for the callers of these functions that need selinux, but not
+ * for all */
 
 int write_string_file_atomic_label_ts(const char *fn, const char *line, struct timespec *ts);
 static inline int write_string_file_atomic_label(const char *fn, const char *line) {
diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index c2326ee9b81..d0ab5a9b6ce 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -8,7 +8,7 @@
 #include "copy.h"
 #include "def.h"
 #include "fd-util.h"
-#include "fileio-label.h"
+#include "fileio.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"
-- 
2.39.2