chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: remove union Unit
[elogind.git]
/
src
/
automount.c
diff --git
a/src/automount.c
b/src/automount.c
index f6f83d43b6a0d00867b60b13ebe8fdcf5584d499..6858e56de3672a8dddacb2aa2be217f2a7882eeb 100644
(file)
--- a/
src/automount.c
+++ b/
src/automount.c
@@
-52,12
+52,14
@@
static void automount_init(Unit *u) {
Automount *a = AUTOMOUNT(u);
assert(u);
Automount *a = AUTOMOUNT(u);
assert(u);
- assert(u->
meta.
load_state == UNIT_STUB);
+ assert(u->load_state == UNIT_STUB);
a->pipe_watch.fd = a->pipe_fd = -1;
a->pipe_watch.type = WATCH_INVALID;
a->directory_mode = 0755;
a->pipe_watch.fd = a->pipe_fd = -1;
a->pipe_watch.type = WATCH_INVALID;
a->directory_mode = 0755;
+
+ a->meta.ignore_on_isolate = true;
}
static void repeat_unmout(const char *path) {
}
static void repeat_unmout(const char *path) {
@@
-103,7
+105,7
@@
static void automount_done(Unit *u) {
assert(a);
unmount_autofs(a);
assert(a);
unmount_autofs(a);
-
a->mount = NULL
;
+
unit_ref_unset(&a->mount)
;
free(a->where);
a->where = NULL;
free(a->where);
a->where = NULL;
@@
-135,12
+137,12
@@
int automount_add_one_mount_link(Automount *a, Mount *m) {
}
static int automount_add_mount_links(Automount *a) {
}
static int automount_add_mount_links(Automount *a) {
-
Meta
*other;
+
Unit
*other;
int r;
assert(a);
int r;
assert(a);
- LIST_FOREACH(units_
per_type, other, a->meta.manager->units_per
_type[UNIT_MOUNT])
+ LIST_FOREACH(units_
by_type, other, a->meta.manager->units_by
_type[UNIT_MOUNT])
if ((r = automount_add_one_mount_link(a, (Mount*) other)) < 0)
return r;
if ((r = automount_add_one_mount_link(a, (Mount*) other)) < 0)
return r;
@@
-196,16
+198,17
@@
static int automount_load(Unit *u) {
Automount *a = AUTOMOUNT(u);
assert(u);
Automount *a = AUTOMOUNT(u);
assert(u);
- assert(u->
meta.
load_state == UNIT_STUB);
+ assert(u->load_state == UNIT_STUB);
/* Load a .automount file */
if ((r = unit_load_fragment_and_dropin_optional(u)) < 0)
return r;
/* Load a .automount file */
if ((r = unit_load_fragment_and_dropin_optional(u)) < 0)
return r;
- if (u->meta.load_state == UNIT_LOADED) {
+ if (u->load_state == UNIT_LOADED) {
+ Unit *x;
if (!a->where)
if (!a->where)
- if (!(a->where = unit_name_to_path(u->
meta.
id)))
+ if (!(a->where = unit_name_to_path(u->id)))
return -ENOMEM;
path_kill_slashes(a->where);
return -ENOMEM;
path_kill_slashes(a->where);
@@
-213,10
+216,14
@@
static int automount_load(Unit *u) {
if ((r = automount_add_mount_links(a)) < 0)
return r;
if ((r = automount_add_mount_links(a)) < 0)
return r;
- if ((r = unit_load_related_unit(u, ".mount", (Unit**) &a->mount)) < 0)
+ r = unit_load_related_unit(u, ".mount", &x);
+ if (r < 0)
return r;
return r;
- if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(a->mount), true)) < 0)
+ unit_ref_set(&a->mount, x);
+
+ r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(a->mount), true);
+ if (r < 0)
return r;
if (a->meta.default_dependencies)
return r;
if (a->meta.default_dependencies)
@@
-256,7
+263,7
@@
static int automount_coldplug(Unit *u) {
if (a->deserialized_state != a->state) {
if (a->deserialized_state != a->state) {
- if ((r = open_dev_autofs(u->m
eta.m
anager)) < 0)
+ if ((r = open_dev_autofs(u->manager)) < 0)
return r;
if (a->deserialized_state == AUTOMOUNT_WAITING ||
return r;
if (a->deserialized_state == AUTOMOUNT_WAITING ||
@@
-567,7
+574,7
@@
static void automount_enter_runnning(Automount *a) {
DBusError error;
assert(a);
DBusError error;
assert(a);
- assert(
a->mount
);
+ assert(
UNIT_DEREF(a->mount)
);
dbus_error_init(&error);
dbus_error_init(&error);
@@
-589,7
+596,7
@@
static void automount_enter_runnning(Automount *a) {
if (!S_ISDIR(st.st_mode) || st.st_dev != a->dev_id)
log_info("%s's automount point already active?", a->meta.id);
if (!S_ISDIR(st.st_mode) || st.st_dev != a->dev_id)
log_info("%s's automount point already active?", a->meta.id);
- else if ((r = manager_add_job(a->meta.manager, JOB_START, UNIT(a->mount), JOB_REPLACE, true, &error, NULL)) < 0) {
+ else if ((r = manager_add_job(a->meta.manager, JOB_START, UNIT
_DEREF
(a->mount), JOB_REPLACE, true, &error, NULL)) < 0) {
log_warning("%s failed to queue mount startup job: %s", a->meta.id, bus_error(&error, r));
goto fail;
}
log_warning("%s failed to queue mount startup job: %s", a->meta.id, bus_error(&error, r));
goto fail;
}
@@
-609,12
+616,12
@@
static int automount_start(Unit *u) {
assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED);
assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED);
- if (path_is_mount_point(a->where)) {
- log_error("Path %s is already a mount point, refusing start for %s", a->where, u->
meta.
id);
+ if (path_is_mount_point(a->where
, false
)) {
+ log_error("Path %s is already a mount point, refusing start for %s", a->where, u->id);
return -EEXIST;
}
return -EEXIST;
}
- if (
a->mount->meta.
load_state != UNIT_LOADED)
+ if (
UNIT_DEREF(a->mount)->
load_state != UNIT_LOADED)
return -ENOENT;
a->failure = false;
return -ENOENT;
a->failure = false;
@@
-736,10
+743,10
@@
static bool automount_check_gc(Unit *u) {
assert(a);
assert(a);
- if (!
a->mount
)
+ if (!
UNIT_DEREF(a->mount)
)
return false;
return false;
- return UNIT_VTABLE(UNIT
(a->mount))->check_gc(UNIT
(a->mount));
+ return UNIT_VTABLE(UNIT
_DEREF(a->mount))->check_gc(UNIT_DEREF
(a->mount));
}
static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
}
static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
@@
-768,7
+775,7
@@
static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
if (packet.v5_packet.pid > 0) {
char *p = NULL;
if (packet.v5_packet.pid > 0) {
char *p = NULL;
- get_process_
name
(packet.v5_packet.pid, &p);
+ get_process_
comm
(packet.v5_packet.pid, &p);
log_debug("Got direct mount request for %s, triggered by %lu (%s)", packet.v5_packet.name, (unsigned long) packet.v5_packet.pid, strna(p));
free(p);
log_debug("Got direct mount request for %s, triggered by %lu (%s)", packet.v5_packet.name, (unsigned long) packet.v5_packet.pid, strna(p));
free(p);
@@
-829,6
+836,11
@@
DEFINE_STRING_TABLE_LOOKUP(automount_state, AutomountState);
const UnitVTable automount_vtable = {
.suffix = ".automount",
const UnitVTable automount_vtable = {
.suffix = ".automount",
+ .object_size = sizeof(Automount),
+ .sections =
+ "Unit\0"
+ "Automount\0"
+ "Install\0",
.no_alias = true,
.no_instances = true,
.no_alias = true,
.no_instances = true,