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

diff --git a/src/core/mount.h b/src/core/mount.h
index a9550697e..76771ab7a 100644
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -23,10 +23,8 @@
 
 typedef struct Mount Mount;
 
-#include "unit.h"
 #include "kill.h"
 #include "execute.h"
-#include "cgroup.h"
 
 typedef enum MountState {
         MOUNT_DEAD,
@@ -54,12 +52,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 +63,12 @@ typedef enum MountResult {
         _MOUNT_RESULT_INVALID = -1
 } MountResult;
 
+typedef struct MountParameters {
+        char *what;
+        char *options;
+        char *fstype;
+} MountParameters;
+
 struct Mount {
         Unit meta;
 
@@ -88,6 +86,8 @@ struct Mount {
         bool just_mounted:1;
         bool just_changed:1;
 
+        bool sloppy_options;
+
         MountResult result;
         MountResult reload_result;
 
@@ -101,13 +101,17 @@ 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;
+
+        unsigned n_retry_umount;
 };
 
 extern const UnitVTable mount_vtable;