X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmount.h;h=954058ceb5465ae6d0e9c9fd0764a077f2fd2a04;hp=4732902ef3c91b2a895d23eb67d20066d2db5e0d;hb=9fe117ea5ac7e8fc36312324c7fdc851adff59f3;hpb=3e5235b0d95020e8260d8deb6d7b070b0e0c60be

diff --git a/src/mount.h b/src/mount.h
index 4732902ef..954058ceb 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,6 +56,7 @@ typedef struct MountParameters {
         char *what;
         char *options;
         char *fstype;
+        int passno;
 } MountParameters;
 
 struct Mount {
@@ -79,17 +80,15 @@ struct Mount {
 
         bool failure:1;
 
-        usec_t timeout_usec;
-
         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,8 +100,6 @@ 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);