X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount.h;h=7cd4320d94e5ed7551211a5115ffdc2f00862a37;hb=da7e457c5b9339721454ae8401a03ffdd781e6a9;hp=9583eebe3aa198638c40bc957258c0b16fa79b7c;hpb=c2f1db8f83618e60dcded8303d14656d7d26b436;p=elogind.git

diff --git a/src/core/mount.h b/src/core/mount.h
index 9583eebe3..7cd4320d9 100644
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -24,6 +24,9 @@
 typedef struct Mount Mount;
 
 #include "unit.h"
+#include "kill.h"
+#include "execute.h"
+#include "cgroup.h"
 
 typedef enum MountState {
         MOUNT_DEAD,
@@ -94,7 +97,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;
 
@@ -109,11 +115,13 @@ 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) _const_;
+MountExecCommand mount_exec_command_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_result_to_string(MountResult i) _const_;
+MountResult mount_result_from_string(const char *s) _pure_;
 
-const char* mount_result_to_string(MountResult i);
-MountResult mount_result_from_string(const char *s);
+void warn_if_dir_nonempty(const char *unit, const char* where);