chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path-util: fix path_is_mount_point() for symlinks
[elogind.git]
/
src
/
core
/
mount.c
diff --git
a/src/core/mount.c
b/src/core/mount.c
index 8e4a3769446a497ba9bfd5d72054e2bc6d6c09cc..1251c94608d6a678fc1f04a33a53a00a4f75363a 100644
(file)
--- a/
src/core/mount.c
+++ b/
src/core/mount.c
@@
-612,7
+612,7
@@
static void mount_set_state(Mount *m, MountState state) {
m->reload_result = MOUNT_SUCCESS;
}
m->reload_result = MOUNT_SUCCESS;
}
-static int mount_coldplug(Unit *u) {
+static int mount_coldplug(Unit *u
, Hashmap *deferred_work
) {
Mount *m = MOUNT(u);
MountState new_state = MOUNT_DEAD;
int r;
Mount *m = MOUNT(u);
MountState new_state = MOUNT_DEAD;
int r;
@@
-706,7
+706,11
@@
static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) {
assert(c);
assert(_pid);
assert(c);
assert(_pid);
- unit_realize_cgroup(UNIT(m));
+ (void) unit_realize_cgroup(UNIT(m));
+ if (m->reset_cpu_usage) {
+ (void) unit_reset_cpu_usage(UNIT(m));
+ m->reset_cpu_usage = false;
+ }
r = unit_setup_exec_runtime(UNIT(m));
if (r < 0)
r = unit_setup_exec_runtime(UNIT(m));
if (r < 0)
@@
-1030,6
+1034,7
@@
static int mount_start(Unit *u) {
m->result = MOUNT_SUCCESS;
m->reload_result = MOUNT_SUCCESS;
m->result = MOUNT_SUCCESS;
m->reload_result = MOUNT_SUCCESS;
+ m->reset_cpu_usage = true;
mount_enter_mounting(m);
return 1;
mount_enter_mounting(m);
return 1;