core: fix timestamp assignment

[elogind.git] / src / core / mount.h

diff --git a/src/core/mount.h b/src/core/mount.h
index 3153a2a99deaecba19e8788443aace1a1b562da0..2edb75eb544c55a63cb2bf14bb63bc5f66776088 100644 (file)
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foomounthfoo
-#define foomounthfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -25,6 +24,9 @@
 typedef struct Mount Mount;
 
 #include "unit.h"
+#include "kill.h"
+#include "execute.h"
+#include "cgroup.h"
 
 typedef enum MountState {
         MOUNT_DEAD,
@@ -56,7 +58,6 @@ typedef struct MountParameters {
         char *what;
         char *options;
         char *fstype;
-        int passno;
 } MountParameters;
 
 typedef enum MountResult {
@@ -75,11 +76,9 @@ struct Mount {
 
         char *where;
 
-        MountParameters parameters_etc_fstab;
         MountParameters parameters_proc_self_mountinfo;
         MountParameters parameters_fragment;
 
-        bool from_etc_fstab:1;
         bool from_proc_self_mountinfo:1;
         bool from_fragment:1;
 
@@ -97,7 +96,10 @@ struct Mount {
         usec_t timeout_usec;
 
         ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
+
         ExecContext exec_context;
+        KillContext kill_context;
+        CGroupContext cgroup_context;
 
         MountState state, deserialized_state;
 
@@ -105,20 +107,20 @@ struct Mount {
         MountExecCommand control_command_id;
         pid_t control_pid;
 
-        Watch timer_watch;
+        sd_event_source *timer_event_source;
 };
 
 extern const UnitVTable mount_vtable;
 
 void mount_fd_event(Manager *m, int events);
 
-const char* mount_state_to_string(MountState i);
-MountState mount_state_from_string(const char *s);
+const char* mount_state_to_string(MountState i) _const_;
+MountState mount_state_from_string(const char *s) _pure_;
 
-const char* mount_exec_command_to_string(MountExecCommand i);
-MountExecCommand mount_exec_command_from_string(const char *s);
+const char* mount_exec_command_to_string(MountExecCommand i) _const_;
+MountExecCommand mount_exec_command_from_string(const char *s) _pure_;
 
-const char* mount_result_to_string(MountResult i);
-MountResult mount_result_from_string(const char *s);
+const char* mount_result_to_string(MountResult i) _const_;
+MountResult mount_result_from_string(const char *s) _pure_;
 
-#endif
+void warn_if_dir_nonempty(const char *unit, const char* where);