chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: fix typo
[elogind.git]
/
src
/
automount.h
diff --git
a/src/automount.h
b/src/automount.h
index 13b56effb6fa96204ea503fc830885e7337e5774..19baee208b2dc62b911b1236b0c82e6e5efc9a17 100644
(file)
--- a/
src/automount.h
+++ b/
src/automount.h
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
#ifndef fooautomounthfoo
#define fooautomounthfoo
#ifndef fooautomounthfoo
#define fooautomounthfoo
@@
-30,29
+30,35
@@
typedef enum AutomountState {
AUTOMOUNT_DEAD,
AUTOMOUNT_WAITING,
AUTOMOUNT_RUNNING,
AUTOMOUNT_DEAD,
AUTOMOUNT_WAITING,
AUTOMOUNT_RUNNING,
- AUTOMOUNT_
MAINTENANCE
,
+ AUTOMOUNT_
FAILED
,
_AUTOMOUNT_STATE_MAX,
_AUTOMOUNT_STATE_INVALID = -1
} AutomountState;
_AUTOMOUNT_STATE_MAX,
_AUTOMOUNT_STATE_INVALID = -1
} AutomountState;
+typedef enum AutomountResult {
+ AUTOMOUNT_SUCCESS,
+ AUTOMOUNT_FAILURE_RESOURCES,
+ _AUTOMOUNT_RESULT_MAX,
+ _AUTOMOUNT_RESULT_INVALID = -1
+} AutomountResult;
+
struct Automount {
struct Automount {
-
Meta
meta;
+
Unit
meta;
AutomountState state, deserialized_state;
char *where;
AutomountState state, deserialized_state;
char *where;
-
Mount *
mount;
+
UnitRef
mount;
int pipe_fd;
int pipe_fd;
+ mode_t directory_mode;
Watch pipe_watch;
dev_t dev_id;
Watch pipe_watch;
dev_t dev_id;
- mode_t directory_mode;
-
Set *tokens;
Set *tokens;
-
bool failure:1
;
+
AutomountResult result
;
};
extern const UnitVTable automount_vtable;
};
extern const UnitVTable automount_vtable;
@@
-64,4
+70,7
@@
int automount_add_one_mount_link(Automount *a, Mount *m);
const char* automount_state_to_string(AutomountState i);
AutomountState automount_state_from_string(const char *s);
const char* automount_state_to_string(AutomountState i);
AutomountState automount_state_from_string(const char *s);
+const char* automount_result_to_string(AutomountResult i);
+AutomountResult automount_result_from_string(const char *s);
+
#endif
#endif