X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmount.h;h=226a1e2f5db5183dee4fbb915738f870b77a0c78;hp=3b28e89ed3ecac2a3a94c21f0b0a91f00ba8ea05;hb=1e59887dc92e163163051e627817e1675374cd22;hpb=e99e38bbdcca3fe5956823bdb3d38544ccf93221 diff --git a/src/mount.h b/src/mount.h index 3b28e89ed..226a1e2f5 100644 --- a/src/mount.h +++ b/src/mount.h @@ -39,7 +39,7 @@ typedef enum MountState { MOUNT_REMOUNTING_SIGKILL, MOUNT_UNMOUNTING_SIGTERM, MOUNT_UNMOUNTING_SIGKILL, - MOUNT_MAINTAINANCE, + MOUNT_MAINTENANCE, _MOUNT_STATE_MAX, _MOUNT_STATE_INVALID = -1 } MountState; @@ -79,6 +79,8 @@ struct Mount { bool failure:1; + mode_t directory_mode; + usec_t timeout_usec; ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX]; @@ -86,8 +88,6 @@ struct Mount { MountState state, deserialized_state; - KillMode kill_mode; - ExecCommand* control_command; MountExecCommand control_command_id; pid_t control_pid; @@ -99,8 +99,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);