X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount.h;h=a53423cc27bff97b171424e57dad47edc15798e7;hb=530a9662aa3d291555e5b3f6eb43199e1b04f63c;hp=a9550697e59a150bb9aa46c110ac1bf7ae394f56;hpb=accdd018ede77ef1c057775396c18c73406cbcb4;p=elogind.git

diff --git a/src/core/mount.h b/src/core/mount.h
index a9550697e..a53423cc2 100644
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -54,12 +54,6 @@ typedef enum MountExecCommand {
         _MOUNT_EXEC_COMMAND_INVALID = -1
 } MountExecCommand;
 
-typedef struct MountParameters {
-        char *what;
-        char *options;
-        char *fstype;
-} MountParameters;
-
 typedef enum MountResult {
         MOUNT_SUCCESS,
         MOUNT_FAILURE_RESOURCES,
@@ -71,6 +65,12 @@ typedef enum MountResult {
         _MOUNT_RESULT_INVALID = -1
 } MountResult;
 
+typedef struct MountParameters {
+        char *what;
+        char *options;
+        char *fstype;
+} MountParameters;
+
 struct Mount {
         Unit meta;
 
@@ -101,13 +101,15 @@ struct Mount {
         KillContext kill_context;
         CGroupContext cgroup_context;
 
+        ExecRuntime *exec_runtime;
+
         MountState state, deserialized_state;
 
         ExecCommand* control_command;
         MountExecCommand control_command_id;
         pid_t control_pid;
 
-        Watch timer_watch;
+        sd_event_source *timer_event_source;
 };
 
 extern const UnitVTable mount_vtable;