[MOUNT_MAINTAINANCE] = "maintainance"
};
+static void service_unwatch_control_pid(Mount *m) {
+ assert(m);
+
+ if (m->control_pid <= 0)
+ return;
+
+ unit_unwatch_pid(UNIT(m), m->control_pid);
+ m->control_pid = 0;
+}
+
static void mount_parameters_done(MountParameters *p) {
assert(p);
exec_command_done_array(m->exec_command, _MOUNT_EXEC_COMMAND_MAX);
m->control_command = NULL;
- if (m->control_pid > 0) {
- unit_unwatch_pid(u, m->control_pid);
- m->control_pid = 0;
- }
+ service_unwatch_control_pid(m);
unit_unwatch_timer(u, &m->timer_watch);
}
state != MOUNT_REMOUNTING_SIGTERM &&
state != MOUNT_REMOUNTING_SIGKILL) {
unit_unwatch_timer(UNIT(m), &m->timer_watch);
-
- if (m->control_pid > 0) {
- unit_unwatch_pid(UNIT(m), m->control_pid);
- m->control_pid = 0;
- }
-
+ service_unwatch_control_pid(m);
m->control_command = NULL;
}
NULL)) < 0)
goto fail;
+ service_unwatch_control_pid(m);
+
if ((r = mount_spawn(m, c, &m->control_pid)) < 0)
goto fail;
if (r < 0)
goto fail;
+ service_unwatch_control_pid(m);
+
if ((r = mount_spawn(m, c, &m->control_pid)) < 0)
goto fail;
goto fail;
}
+ service_unwatch_control_pid(m);
+
if ((r = mount_spawn(m, c, &m->control_pid)) < 0)
goto fail;