X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount.h;h=d6987e6fa199b34832e53a9ab04775dab679f6ec;hb=63c372cb9df3bee01e3bf8cd7f96f336bddda846;hp=2edb75eb544c55a63cb2bf14bb63bc5f66776088;hpb=718db96199eb307751264e4163555662c9a389fa;p=elogind.git

diff --git a/src/core/mount.h b/src/core/mount.h
index 2edb75eb5..d6987e6fa 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;
 
@@ -88,6 +88,8 @@ struct Mount {
         bool just_mounted:1;
         bool just_changed:1;
 
+        bool sloppy_options;
+
         MountResult result;
         MountResult reload_result;
 
@@ -101,6 +103,8 @@ struct Mount {
         KillContext kill_context;
         CGroupContext cgroup_context;
 
+        ExecRuntime *exec_runtime;
+
         MountState state, deserialized_state;
 
         ExecCommand* control_command;
@@ -108,6 +112,8 @@ struct Mount {
         pid_t control_pid;
 
         sd_event_source *timer_event_source;
+
+        unsigned n_retry_umount;
 };
 
 extern const UnitVTable mount_vtable;