chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix return value on OOM
[elogind.git]
/
src
/
core
/
mount.h
diff --git
a/src/core/mount.h
b/src/core/mount.h
index 7cd4320d94e5ed7551211a5115ffdc2f00862a37..76771ab7a92fe1542f83b06044a726e2f20bf159 100644
(file)
--- a/
src/core/mount.h
+++ b/
src/core/mount.h
@@
-23,10
+23,8
@@
typedef struct Mount Mount;
typedef struct Mount Mount;
-#include "unit.h"
#include "kill.h"
#include "execute.h"
#include "kill.h"
#include "execute.h"
-#include "cgroup.h"
typedef enum MountState {
MOUNT_DEAD,
typedef enum MountState {
MOUNT_DEAD,
@@
-54,13
+52,6
@@
typedef enum MountExecCommand {
_MOUNT_EXEC_COMMAND_INVALID = -1
} MountExecCommand;
_MOUNT_EXEC_COMMAND_INVALID = -1
} MountExecCommand;
-typedef struct MountParameters {
- char *what;
- char *options;
- char *fstype;
- int passno;
-} MountParameters;
-
typedef enum MountResult {
MOUNT_SUCCESS,
MOUNT_FAILURE_RESOURCES,
typedef enum MountResult {
MOUNT_SUCCESS,
MOUNT_FAILURE_RESOURCES,
@@
-72,6
+63,12
@@
typedef enum MountResult {
_MOUNT_RESULT_INVALID = -1
} MountResult;
_MOUNT_RESULT_INVALID = -1
} MountResult;
+typedef struct MountParameters {
+ char *what;
+ char *options;
+ char *fstype;
+} MountParameters;
+
struct Mount {
Unit meta;
struct Mount {
Unit meta;
@@
-89,6
+86,8
@@
struct Mount {
bool just_mounted:1;
bool just_changed:1;
bool just_mounted:1;
bool just_changed:1;
+ bool sloppy_options;
+
MountResult result;
MountResult reload_result;
MountResult result;
MountResult reload_result;
@@
-102,13
+101,17
@@
struct Mount {
KillContext kill_context;
CGroupContext cgroup_context;
KillContext kill_context;
CGroupContext cgroup_context;
+ ExecRuntime *exec_runtime;
+
MountState state, deserialized_state;
ExecCommand* control_command;
MountExecCommand control_command_id;
pid_t control_pid;
MountState state, deserialized_state;
ExecCommand* control_command;
MountExecCommand control_command_id;
pid_t control_pid;
- Watch timer_watch;
+ sd_event_source *timer_event_source;
+
+ unsigned n_retry_umount;
};
extern const UnitVTable mount_vtable;
};
extern const UnitVTable mount_vtable;