mountfsd: Clean up includes

Split out of #37344.

diff --git a/src/mountfsd/mountfsd-manager.c b/src/mountfsd/mountfsd-manager.c
index 0d24e2d696a250b485d3c155a1738fbf8ae0a4aa..fdd98d7936fd7da88c7ec3edf1baa028228e84c7 100644 (file)
--- a/src/mountfsd/mountfsd-manager.c
+++ b/src/mountfsd/mountfsd-manager.c
@@ -1,22 +1,26 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
+
+#include <stdlib.h>
 #include <sys/wait.h>
 
 #include "sd-daemon.h"
 
+#include "alloc-util.h"
 #include "build-path.h"
 #include "common-signal.h"
 #include "env-util.h"
 #include "event-util.h"
 #include "fd-util.h"
-#include "fs-util.h"
+#include "format-util.h"
 #include "log.h"
-#include "mkdir.h"
 #include "mountfsd-manager.h"
 #include "process-util.h"
 #include "set.h"
 #include "signal-util.h"
 #include "socket-util.h"
 #include "stdio-util.h"
+#include "string-util.h"
+#include "time-util.h"
 #include "umask-util.h"
 
 #define LISTEN_TIMEOUT_USEC (25 * USEC_PER_SEC)

diff --git a/src/mountfsd/mountfsd-manager.h b/src/mountfsd/mountfsd-manager.h
index 6bfbddcd177cf65ead860b2f540c89b48945e2b6..06bd15f09a182160755e9ed2d2080b7abe015b30 100644 (file)
--- a/src/mountfsd/mountfsd-manager.h
+++ b/src/mountfsd/mountfsd-manager.h
@@ -1,18 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "sd-bus.h"
-#include "sd-event.h"
-
-typedef struct Manager Manager;
-
-#include "hashmap.h"
+#include "forward.h"
 #include "ratelimit.h"
 
 #define MOUNTFS_WORKERS_MIN 3
 #define MOUNTFS_WORKERS_MAX 4096
 
-struct Manager {
+typedef struct Manager {
         sd_event *event;
 
         Set *workers_fixed;    /* Workers 0…MOUNTFS_WORKERS_MIN */
@@ -21,7 +16,7 @@ struct Manager {
         int listen_fd;
 
         RateLimit worker_ratelimit;
-};
+} Manager;
 
 int manager_new(Manager **ret);
 Manager* manager_free(Manager *m);

diff --git a/src/mountfsd/mountfsd.c b/src/mountfsd/mountfsd.c
index 87f4ab725a61aee7c1c840e97c52aa9f77b537b9..6894c31b3f709b21d3e02d470e059e1f48c319d7 100644 (file)
--- a/src/mountfsd/mountfsd.c
+++ b/src/mountfsd/mountfsd.c
@@ -1,7 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <sys/stat.h>
-#include <sys/types.h>
+
+#include "sd-event.h"
 
 #include "daemon-util.h"
 #include "log.h"

diff --git a/src/mountfsd/mountwork.c b/src/mountfsd/mountwork.c
index 8f24d2c3de824d8eed8e393bc6073cc66458265f..d932169e56adaf6030b65c7d0d46835ef0dbc312 100644 (file)
--- a/src/mountfsd/mountwork.c
+++ b/src/mountfsd/mountwork.c
@@ -1,9 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <linux/loop.h>
+#include <poll.h>
+#include <stdlib.h>
 #include <sys/mount.h>
 
 #include "sd-daemon.h"
+#include "sd-event.h"
 #include "sd-varlink.h"
 
 #include "argv-util.h"
@@ -14,20 +17,28 @@
 #include "env-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
+#include "format-util.h"
+#include "hashmap.h"
+#include "image-policy.h"
 #include "io-util.h"
 #include "json-util.h"
+#include "loop-util.h"
 #include "main-func.h"
+#include "memory-util.h"
 #include "missing_syscall.h"
 #include "namespace-util.h"
 #include "nsresource.h"
 #include "nulstr-util.h"
 #include "os-util.h"
-#include "process-util.h"
+#include "path-util.h"
+#include "pidref.h"
 #include "stat-util.h"
 #include "string-table.h"
+#include "string-util.h"
+#include "strv.h"
+#include "time-util.h"
 #include "uid-classification.h"
 #include "uid-range.h"
-#include "user-util.h"
 #include "varlink-io.systemd.MountFileSystem.h"
 #include "varlink-util.h"