chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
job: fix serialization
[elogind.git]
/
src
/
core
/
mount.h
diff --git
a/src/core/mount.h
b/src/core/mount.h
index bcc10ee0d4613c73b2123a5af40169f418ddc2d2..2edb75eb544c55a63cb2bf14bb63bc5f66776088 100644
(file)
--- a/
src/core/mount.h
+++ b/
src/core/mount.h
@@
-25,6
+25,8
@@
typedef struct Mount Mount;
#include "unit.h"
#include "kill.h"
#include "unit.h"
#include "kill.h"
+#include "execute.h"
+#include "cgroup.h"
typedef enum MountState {
MOUNT_DEAD,
typedef enum MountState {
MOUNT_DEAD,
@@
-56,7
+58,6
@@
typedef struct MountParameters {
char *what;
char *options;
char *fstype;
char *what;
char *options;
char *fstype;
- int passno;
} MountParameters;
typedef enum MountResult {
} MountParameters;
typedef enum MountResult {
@@
-95,8
+96,10
@@
struct Mount {
usec_t timeout_usec;
ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
usec_t timeout_usec;
ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
+
ExecContext exec_context;
KillContext kill_context;
ExecContext exec_context;
KillContext kill_context;
+ CGroupContext cgroup_context;
MountState state, deserialized_state;
MountState state, deserialized_state;
@@
-104,7
+107,7
@@
struct Mount {
MountExecCommand control_command_id;
pid_t control_pid;
MountExecCommand control_command_id;
pid_t control_pid;
-
Watch timer_watch
;
+
sd_event_source *timer_event_source
;
};
extern const UnitVTable mount_vtable;
};
extern const UnitVTable mount_vtable;