X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmount.h;h=9318444249c33e5838dd0c01551eae35140ac212;hb=81006b8ad8cfdbfdb418fc99918ee5c33eb5b35a;hp=4732902ef3c91b2a895d23eb67d20066d2db5e0d;hpb=3e5235b0d95020e8260d8deb6d7b070b0e0c60be;p=elogind.git

diff --git a/src/mount.h b/src/mount.h
index 4732902ef..931844424 100644
--- a/src/mount.h
+++ b/src/mount.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foomounthfoo
 #define foomounthfoo
@@ -39,7 +39,7 @@ typedef enum MountState {
         MOUNT_REMOUNTING_SIGKILL,
         MOUNT_UNMOUNTING_SIGTERM,
         MOUNT_UNMOUNTING_SIGKILL,
-        MOUNT_MAINTENANCE,
+        MOUNT_FAILED,
         _MOUNT_STATE_MAX,
         _MOUNT_STATE_INVALID = -1
 } MountState;
@@ -56,10 +56,22 @@ typedef struct MountParameters {
         char *what;
         char *options;
         char *fstype;
+        int passno;
 } MountParameters;
 
+typedef enum MountResult {
+        MOUNT_SUCCESS,
+        MOUNT_FAILURE_RESOURCES,
+        MOUNT_FAILURE_TIMEOUT,
+        MOUNT_FAILURE_EXIT_CODE,
+        MOUNT_FAILURE_SIGNAL,
+        MOUNT_FAILURE_CORE_DUMP,
+        _MOUNT_RESULT_MAX,
+        _MOUNT_RESULT_INVALID = -1
+} MountResult;
+
 struct Mount {
-        Meta meta;
+        Unit meta;
 
         char *where;
 
@@ -77,19 +89,18 @@ struct Mount {
         bool just_mounted:1;
         bool just_changed:1;
 
-        bool failure:1;
-
-        usec_t timeout_usec;
+        MountResult result;
+        MountResult reload_result;
 
         mode_t directory_mode;
 
+        usec_t timeout_usec;
+
         ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
         ExecContext exec_context;
 
         MountState state, deserialized_state;
 
-        KillMode kill_mode;
-
         ExecCommand* control_command;
         MountExecCommand control_command_id;
         pid_t control_pid;
@@ -101,12 +112,13 @@ extern const UnitVTable mount_vtable;
 
 void mount_fd_event(Manager *m, int events);
 
-int mount_path_is_mounted(Manager *m, const char* path);
-
 const char* mount_state_to_string(MountState i);
 MountState mount_state_from_string(const char *s);
 
 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);
+MountResult mount_result_from_string(const char *s);
+
 #endif