X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmount.c;h=5c45686c2a0806d6f80e8bf7506cb7a8112b2e0b;hp=5b433c970a85466f24a290b032896ff9f9446ee3;hb=1124fe6f01b1d59d016c238026f20380f38d98dc;hpb=ba035df230e41bf9d70ebb47915c9472b7884412 diff --git a/src/mount.c b/src/mount.c index 5b433c970..5c45686c2 100644 --- a/src/mount.c +++ b/src/mount.c @@ -36,6 +36,8 @@ #include "dbus-mount.h" #include "special.h" #include "bus-errors.h" +#include "exit-status.h" +#include "def.h" static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { [MOUNT_DEAD] = UNIT_INACTIVE, @@ -57,13 +59,20 @@ static void mount_init(Unit *u) { Mount *m = MOUNT(u); assert(u); - assert(u->meta.load_state == UNIT_STUB); + assert(u->load_state == UNIT_STUB); m->timeout_usec = DEFAULT_TIMEOUT_USEC; m->directory_mode = 0755; exec_context_init(&m->exec_context); + /* The stdio/kmsg bridge socket is on /, in order to avoid a + * dep loop, don't use kmsg logging for -.mount */ + if (!unit_has_name(u, "-.mount")) { + m->exec_context.std_output = u->manager->default_std_output; + m->exec_context.std_error = u->manager->default_std_error; + } + /* We need to make sure that /bin/mount is always called in * the same process group as us, so that the autofs kernel * side doesn't send us another mount request while we are @@ -73,6 +82,8 @@ static void mount_init(Unit *u) { m->timer_watch.type = WATCH_INVALID; m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID; + + UNIT(m)->ignore_on_isolate = true; } static void mount_unwatch_control_pid(Mount *m) { @@ -116,46 +127,56 @@ static void mount_done(Unit *u) { unit_unwatch_timer(u, &m->timer_watch); } +static MountParameters* get_mount_parameters_configured(Mount *m) { + assert(m); + + if (m->from_fragment) + return &m->parameters_fragment; + else if (m->from_etc_fstab) + return &m->parameters_etc_fstab; + + return NULL; +} + +static MountParameters* get_mount_parameters(Mount *m) { + assert(m); + + if (m->from_proc_self_mountinfo) + return &m->parameters_proc_self_mountinfo; + + return get_mount_parameters_configured(m); +} + static int mount_add_mount_links(Mount *m) { - Meta *other; + Unit *other; int r; MountParameters *pm; assert(m); - if (m->from_fragment) - pm = &m->parameters_fragment; - else if (m->from_etc_fstab) - pm = &m->parameters_etc_fstab; - else - pm = NULL; + pm = get_mount_parameters_configured(m); /* Adds in links to other mount points that might lie below or * above us in the hierarchy */ - LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_MOUNT]) { + LIST_FOREACH(units_by_type, other, UNIT(m)->manager->units_by_type[UNIT_MOUNT]) { Mount *n = (Mount*) other; MountParameters *pn; if (n == m) continue; - if (n->meta.load_state != UNIT_LOADED) + if (UNIT(n)->load_state != UNIT_LOADED) continue; - if (n->from_fragment) - pn = &n->parameters_fragment; - else if (n->from_etc_fstab) - pn = &n->parameters_etc_fstab; - else - pn = NULL; + pn = get_mount_parameters_configured(n); if (path_startswith(m->where, n->where)) { if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, UNIT(n), true)) < 0) return r; - if (n->from_etc_fstab || n->from_fragment) + if (pn) if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, UNIT(n), true)) < 0) return r; @@ -164,7 +185,7 @@ static int mount_add_mount_links(Mount *m) { if ((r = unit_add_dependency(UNIT(n), UNIT_AFTER, UNIT(m), true)) < 0) return r; - if (m->from_etc_fstab || m->from_fragment) + if (pm) if ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0) return r; @@ -173,18 +194,16 @@ static int mount_add_mount_links(Mount *m) { if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, UNIT(n), true)) < 0) return r; - if (m->from_etc_fstab || m->from_fragment) - if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, UNIT(n), true)) < 0) - return r; + if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, UNIT(n), true)) < 0) + return r; } else if (pn && path_startswith(pn->what, m->where)) { if ((r = unit_add_dependency(UNIT(n), UNIT_AFTER, UNIT(m), true)) < 0) return r; - if (n->from_etc_fstab || n->from_fragment) - if ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0) - return r; + if ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0) + return r; } } @@ -192,12 +211,12 @@ static int mount_add_mount_links(Mount *m) { } static int mount_add_swap_links(Mount *m) { - Meta *other; + Unit *other; int r; assert(m); - LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_SWAP]) + LIST_FOREACH(units_by_type, other, UNIT(m)->manager->units_by_type[UNIT_SWAP]) if ((r = swap_add_one_mount_link((Swap*) other, m)) < 0) return r; @@ -205,12 +224,12 @@ static int mount_add_swap_links(Mount *m) { } static int mount_add_path_links(Mount *m) { - Meta *other; + Unit *other; int r; assert(m); - LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_PATH]) + LIST_FOREACH(units_by_type, other, UNIT(m)->manager->units_by_type[UNIT_PATH]) if ((r = path_add_one_mount_link((Path*) other, m)) < 0) return r; @@ -218,12 +237,12 @@ static int mount_add_path_links(Mount *m) { } static int mount_add_automount_links(Mount *m) { - Meta *other; + Unit *other; int r; assert(m); - LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_AUTOMOUNT]) + LIST_FOREACH(units_by_type, other, UNIT(m)->manager->units_by_type[UNIT_AUTOMOUNT]) if ((r = automount_add_one_mount_link((Automount*) other, m)) < 0) return r; @@ -231,12 +250,12 @@ static int mount_add_automount_links(Mount *m) { } static int mount_add_socket_links(Mount *m) { - Meta *other; + Unit *other; int r; assert(m); - LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_SOCKET]) + LIST_FOREACH(units_by_type, other, UNIT(m)->manager->units_by_type[UNIT_SOCKET]) if ((r = socket_add_one_mount_link((Socket*) other, m)) < 0) return r; @@ -260,8 +279,48 @@ static char* mount_test_option(const char *haystack, const char *needle) { return hasmntopt(&me, needle); } -static int mount_add_target_links(Mount *m) { - const char *target, *after = NULL; +static bool mount_is_network(MountParameters *p) { + assert(p); + + if (mount_test_option(p->options, "_netdev")) + return true; + + if (p->fstype && fstype_is_network(p->fstype)) + return true; + + return false; +} + +static bool mount_is_bind(MountParameters *p) { + assert(p); + + if (mount_test_option(p->options, "bind")) + return true; + + if (p->fstype && streq(p->fstype, "bind")) + return true; + + return false; +} + +static bool needs_quota(MountParameters *p) { + assert(p); + + if (mount_is_network(p)) + return false; + + if (mount_is_bind(p)) + return false; + + return mount_test_option(p->options, "usrquota") || + mount_test_option(p->options, "grpquota") || + mount_test_option(p->options, "quota") || + mount_test_option(p->options, "usrjquota") || + mount_test_option(p->options, "grpjquota"); +} + +static int mount_add_fstab_links(Mount *m) { + const char *target, *after = NULL, *after2 = NULL; MountParameters *p; Unit *tu; int r; @@ -269,68 +328,76 @@ static int mount_add_target_links(Mount *m) { assert(m); - if (m->from_fragment) - p = &m->parameters_fragment; - else if (m->from_etc_fstab) - p = &m->parameters_etc_fstab; - else + if (UNIT(m)->manager->running_as != MANAGER_SYSTEM) return 0; - noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO); - nofail = !!mount_test_option(p->options, "nofail"); - handle = !!mount_test_option(p->options, "comment=systemd.mount") || - m->meta.manager->mount_auto; - automount = !!mount_test_option(p->options, "comment=systemd.automount"); + if (!(p = get_mount_parameters_configured(m))) + return 0; - if (mount_test_option(p->options, "_netdev") || - (p->fstype && fstype_is_network(p->fstype))) { - target = SPECIAL_REMOTE_FS_TARGET; + if (p != &m->parameters_etc_fstab) + return 0; - if (m->meta.manager->running_as == MANAGER_SYSTEM) - after = SPECIAL_NETWORK_TARGET; - } else + noauto = !!mount_test_option(p->options, "noauto"); + nofail = !!mount_test_option(p->options, "nofail"); + automount = + mount_test_option(p->options, "comment=systemd.automount") || + mount_test_option(p->options, "x-systemd-automount"); + handle = + automount || + mount_test_option(p->options, "comment=systemd.mount") || + mount_test_option(p->options, "x-systemd-mount") || + UNIT(m)->manager->mount_auto; + + if (mount_is_network(p)) { + target = SPECIAL_REMOTE_FS_TARGET; + after = SPECIAL_REMOTE_FS_PRE_TARGET; + after2 = SPECIAL_NETWORK_TARGET; + } else { target = SPECIAL_LOCAL_FS_TARGET; + after = SPECIAL_LOCAL_FS_PRE_TARGET; + } - if ((r = manager_load_unit(m->meta.manager, target, NULL, NULL, &tu)) < 0) + if ((r = manager_load_unit(UNIT(m)->manager, target, NULL, NULL, &tu)) < 0) return r; if (after) - if ((r = unit_add_dependency_by_name(tu, UNIT_AFTER, after, NULL, true)) < 0) + if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0) return r; - if (automount && m->meta.manager->running_as == MANAGER_SYSTEM) { + if (after2) + if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after2, NULL, true)) < 0) + return r; + + if (automount) { Unit *am; if ((r = unit_load_related_unit(UNIT(m), ".automount", &am)) < 0) return r; - return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_WANTS, UNIT(am), true); - } else { - - /* Automatically add mount points that aren't natively - * configured to local-fs.target */ - if (!noauto && - !nofail && - handle && - m->from_etc_fstab && - m->meta.manager->running_as == MANAGER_SYSTEM) + /* If auto is configured as well also pull in the + * mount right-away, but don't rely on it. */ + if (!noauto) /* automount + auto */ if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true)) < 0) return r; - return unit_add_dependency(UNIT(m), UNIT_BEFORE, tu, true); - } -} + /* Install automount unit */ + if (!nofail) /* automount + fail */ + return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_REQUIRES, am, true); + else /* automount + nofail */ + return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_WANTS, am, true); -static bool mount_is_bind(MountParameters *p) { - assert(p); + } else if (handle && !noauto) { - if (p->fstype && streq(p->fstype, "bind")) - return true; + /* Automatically add mount points that aren't natively + * configured to local-fs.target */ - if (mount_test_option(p->options, "bind")) - return true; + if (!nofail) /* auto + fail */ + return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_REQUIRES, UNIT(m), true); + else /* auto + nofail */ + return unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true); + } - return false; + return 0; } static int mount_add_device_links(Mount *m) { @@ -339,30 +406,29 @@ static int mount_add_device_links(Mount *m) { assert(m); - if (m->from_fragment) - p = &m->parameters_fragment; - else if (m->from_etc_fstab) - p = &m->parameters_etc_fstab; - else + if (!(p = get_mount_parameters_configured(m))) return 0; if (!p->what) return 0; - if (!mount_is_bind(p) && !path_equal(m->where, "/")) { + if (!mount_is_bind(p) && + !path_equal(m->where, "/") && + p == &m->parameters_etc_fstab) { bool nofail, noauto; - noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO); + noauto = !!mount_test_option(p->options, "noauto"); nofail = !!mount_test_option(p->options, "nofail"); if ((r = unit_add_node_link(UNIT(m), p->what, !noauto && nofail && - UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM)) < 0) + UNIT(m)->manager->running_as == MANAGER_SYSTEM)) < 0) return r; } if (p->passno > 0 && - UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM && + !mount_is_bind(p) && + UNIT(m)->manager->running_as == MANAGER_SYSTEM && !path_equal(m->where, "/")) { char *name; Unit *fsck; @@ -372,7 +438,7 @@ static int mount_add_device_links(Mount *m) { if (!(name = unit_name_from_path_instance("fsck", p->what, ".service"))) return -ENOMEM; - if ((r = manager_load_unit_prepare(m->meta.manager, name, NULL, NULL, &fsck)) < 0) { + if ((r = manager_load_unit_prepare(UNIT(m)->manager, name, NULL, NULL, &fsck)) < 0) { log_warning("Failed to prepare unit %s: %s", name, strerror(-r)); free(name); return r; @@ -391,17 +457,70 @@ static int mount_add_device_links(Mount *m) { static int mount_add_default_dependencies(Mount *m) { int r; + MountParameters *p; assert(m); - if (m->meta.manager->running_as == MANAGER_SYSTEM && - !path_equal(m->where, "/")) { + if (UNIT(m)->manager->running_as != MANAGER_SYSTEM) + return 0; - if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0) + p = get_mount_parameters_configured(m); + if (p && needs_quota(p)) { + if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0 || + (r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTAON_SERVICE, NULL, true)) < 0) return r; + } + if (!path_equal(m->where, "/")) if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) return r; + + return 0; +} + +static int mount_fix_timeouts(Mount *m) { + MountParameters *p; + const char *timeout = NULL; + Unit *other; + Iterator i; + usec_t u; + char *t; + int r; + + assert(m); + + if (!(p = get_mount_parameters_configured(m))) + return 0; + + /* Allow configuration how long we wait for a device that + * backs a mount point to show up. This is useful to support + * endless device timeouts for devices that show up only after + * user input, like crypto devices. */ + + if ((timeout = mount_test_option(p->options, "comment=systemd.device-timeout"))) + timeout += 31; + else if ((timeout = mount_test_option(p->options, "x-systemd-device-timeout"))) + timeout += 25; + else + return 0; + + t = strndup(timeout, strcspn(timeout, ",;" WHITESPACE)); + if (!t) + return -ENOMEM; + + r = parse_usec(t, &u); + free(t); + + if (r < 0) { + log_warning("Failed to parse timeout for %s, ignoring: %s", m->where, timeout); + return r; + } + + SET_FOREACH(other, UNIT(m)->dependencies[UNIT_AFTER], i) { + if (other->type != UNIT_DEVICE) + continue; + + other->job_timeout = u; } return 0; @@ -412,7 +531,7 @@ static int mount_verify(Mount *m) { char *e; assert(m); - if (m->meta.load_state != UNIT_LOADED) + if (UNIT(m)->load_state != UNIT_LOADED) return 0; if (!m->from_etc_fstab && !m->from_fragment && !m->from_proc_self_mountinfo) @@ -425,17 +544,22 @@ static int mount_verify(Mount *m) { free(e); if (!b) { - log_error("%s's Where setting doesn't match unit name. Refusing.", m->meta.id); + log_error("%s's Where setting doesn't match unit name. Refusing.", UNIT(m)->id); return -EINVAL; } - if (m->meta.fragment_path && !m->parameters_fragment.what) { - log_error("%s's What setting is missing. Refusing.", m->meta.id); + if (mount_point_is_api(m->where) || mount_point_ignore(m->where)) { + log_error("Cannot create mount unit for API file system %s. Refusing.", m->where); + return -EINVAL; + } + + if (UNIT(m)->fragment_path && !m->parameters_fragment.what) { + log_error("%s's What setting is missing. Refusing.", UNIT(m)->id); return -EBADMSG; } if (m->exec_context.pam_name && m->exec_context.kill_mode != KILL_CONTROL_GROUP) { - log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", m->meta.id); + log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", UNIT(m)->id); return -EINVAL; } @@ -447,23 +571,26 @@ static int mount_load(Unit *u) { int r; assert(u); - assert(u->meta.load_state == UNIT_STUB); + assert(u->load_state == UNIT_STUB); if ((r = unit_load_fragment_and_dropin_optional(u)) < 0) return r; /* This is a new unit? Then let's add in some extras */ - if (u->meta.load_state == UNIT_LOADED) { - if (m->meta.fragment_path) + if (u->load_state == UNIT_LOADED) { + if ((r = unit_add_exec_dependencies(u, &m->exec_context)) < 0) + return r; + + if (UNIT(m)->fragment_path) m->from_fragment = true; if (!m->where) - if (!(m->where = unit_name_to_path(u->meta.id))) + if (!(m->where = unit_name_to_path(u->id))) return -ENOMEM; path_kill_slashes(m->where); - if (!m->meta.description) + if (!UNIT(m)->description) if ((r = unit_set_description(u, m->where)) < 0) return r; @@ -485,15 +612,17 @@ static int mount_load(Unit *u) { if ((r = mount_add_automount_links(m)) < 0) return r; - if ((r = mount_add_target_links(m)) < 0) + if ((r = mount_add_fstab_links(m)) < 0) return r; + if (UNIT(m)->default_dependencies) + if ((r = mount_add_default_dependencies(m)) < 0) + return r; + if ((r = unit_add_default_cgroups(u)) < 0) return r; - if (m->meta.default_dependencies) - if ((r = mount_add_default_dependencies(m)) < 0) - return r; + mount_fix_timeouts(m); } return mount_verify(m); @@ -502,13 +631,18 @@ static int mount_load(Unit *u) { static int mount_notify_automount(Mount *m, int status) { Unit *p; int r; + Iterator i; assert(m); - if ((r = unit_get_related_unit(UNIT(m), ".automount", &p)) < 0) - return r == -ENOENT ? 0 : r; + SET_FOREACH(p, UNIT(m)->dependencies[UNIT_TRIGGERED_BY], i) + if (p->type == UNIT_AUTOMOUNT) { + r = automount_send_ready(AUTOMOUNT(p), status); + if (r < 0) + return r; + } - return automount_send_ready(AUTOMOUNT(p), status); + return 0; } static void mount_set_state(Mount *m, MountState state) { @@ -550,11 +684,12 @@ static void mount_set_state(Mount *m, MountState state) { if (state != old_state) log_debug("%s changed %s -> %s", - m->meta.id, + UNIT(m)->id, mount_state_to_string(old_state), mount_state_to_string(state)); - unit_notify(UNIT(m), state_translation_table[old_state], state_translation_table[state]); + unit_notify(UNIT(m), state_translation_table[old_state], state_translation_table[state], !m->reload_failure); + m->reload_failure = false; } static int mount_coldplug(Unit *u) { @@ -606,12 +741,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { assert(m); assert(f); - if (m->from_proc_self_mountinfo) - p = &m->parameters_proc_self_mountinfo; - else if (m->from_fragment) - p = &m->parameters_fragment; - else - p = &m->parameters_etc_fstab; + p = get_mount_parameters(m); fprintf(f, "%sMount State: %s\n" @@ -656,12 +786,13 @@ static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) { NULL, &m->exec_context, NULL, 0, - m->meta.manager->environment, + UNIT(m)->manager->environment, true, true, true, - m->meta.manager->confirm_spawn, - m->meta.cgroup_bondings, + UNIT(m)->manager->confirm_spawn, + UNIT(m)->cgroup_bondings, + UNIT(m)->cgroup_attributes, &pid)) < 0) goto fail; @@ -713,9 +844,7 @@ static void mount_enter_signal(Mount *m, MountState state, bool success) { state == MOUNT_REMOUNTING_SIGTERM) ? m->exec_context.kill_signal : SIGKILL; if (m->control_pid > 0) { - if (kill(m->exec_context.kill_mode == KILL_PROCESS_GROUP ? - -m->control_pid : - m->control_pid, sig) < 0 && errno != ESRCH) + if (kill_and_sigcont(m->control_pid, sig) < 0 && errno != ESRCH) log_warning("Failed to kill control process %li: %m", (long) m->control_pid); else @@ -734,13 +863,14 @@ static void mount_enter_signal(Mount *m, MountState state, bool success) { if ((r = set_put(pid_set, LONG_TO_PTR(m->control_pid))) < 0) goto fail; - if ((r = cgroup_bonding_kill_list(m->meta.cgroup_bondings, sig, pid_set)) < 0) { + if ((r = cgroup_bonding_kill_list(UNIT(m)->cgroup_bondings, sig, true, pid_set)) < 0) { if (r != -EAGAIN && r != -ESRCH && r != -ENOENT) log_warning("Failed to kill control group: %s", strerror(-r)); } else if (r > 0) wait_for_exit = true; set_free(pid_set); + pid_set = NULL; } } @@ -757,7 +887,7 @@ static void mount_enter_signal(Mount *m, MountState state, bool success) { return; fail: - log_warning("%s failed to kill processes: %s", m->meta.id, strerror(-r)); + log_warning("%s failed to kill processes: %s", UNIT(m)->id, strerror(-r)); if (state == MOUNT_REMOUNTING_SIGTERM || state == MOUNT_REMOUNTING_SIGKILL) mount_enter_mounted(m, false); @@ -796,12 +926,13 @@ static void mount_enter_unmounting(Mount *m, bool success) { return; fail: - log_warning("%s failed to run 'umount' task: %s", m->meta.id, strerror(-r)); + log_warning("%s failed to run 'umount' task: %s", UNIT(m)->id, strerror(-r)); mount_enter_mounted(m, false); } static void mount_enter_mounting(Mount *m) { int r; + MountParameters *p; assert(m); @@ -810,6 +941,11 @@ static void mount_enter_mounting(Mount *m) { mkdir_p(m->where, m->directory_mode); + /* Create the source directory for bind-mounts if needed */ + p = get_mount_parameters_configured(m); + if (p && mount_is_bind(p)) + mkdir_p(p->what, m->directory_mode); + if (m->from_fragment) r = exec_command_set( m->control_command, @@ -841,7 +977,7 @@ static void mount_enter_mounting(Mount *m) { return; fail: - log_warning("%s failed to run 'mount' task: %s", m->meta.id, strerror(-r)); + log_warning("%s failed to run 'mount' task: %s", UNIT(m)->id, strerror(-r)); mount_enter_dead(m, false); } @@ -909,8 +1045,9 @@ static void mount_enter_remounting(Mount *m, bool success) { return; fail: - log_warning("%s failed to run 'remount' task: %s", m->meta.id, strerror(-r)); - mount_enter_mounted(m, false); + log_warning("%s failed to run 'remount' task: %s", UNIT(m)->id, strerror(-r)); + m->reload_failure = true; + mount_enter_mounted(m, true); } static int mount_start(Unit *u) { @@ -1077,13 +1214,13 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { m->failure = m->failure || !success; if (m->control_command) { - exec_status_exit(&m->control_command->exec_status, pid, code, status, m->exec_context.utmp_id); + exec_status_exit(&m->control_command->exec_status, &m->exec_context, pid, code, status); m->control_command = NULL; m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID; } log_full(success ? LOG_DEBUG : LOG_NOTICE, - "%s mount process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status); + "%s mount process exited, code=%s status=%i", u->id, sigchld_code_to_string(code), status); /* Note that mount(8) returning and the kernel sending us a * mount table change event might happen out-of-order. If an @@ -1098,9 +1235,6 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { case MOUNT_MOUNTING_DONE: case MOUNT_MOUNTING_SIGKILL: case MOUNT_MOUNTING_SIGTERM: - case MOUNT_REMOUNTING: - case MOUNT_REMOUNTING_SIGKILL: - case MOUNT_REMOUNTING_SIGTERM: if (success) mount_enter_mounted(m, true); @@ -1110,6 +1244,18 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { mount_enter_dead(m, false); break; + case MOUNT_REMOUNTING: + case MOUNT_REMOUNTING_SIGKILL: + case MOUNT_REMOUNTING_SIGTERM: + + m->reload_failure = !success; + if (m->from_proc_self_mountinfo) + mount_enter_mounted(m, true); + else + mount_enter_dead(m, true); + + break; + case MOUNT_UNMOUNTING: case MOUNT_UNMOUNTING_SIGKILL: case MOUNT_UNMOUNTING_SIGTERM: @@ -1141,26 +1287,27 @@ static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) { case MOUNT_MOUNTING: case MOUNT_MOUNTING_DONE: - log_warning("%s mounting timed out. Stopping.", u->meta.id); + log_warning("%s mounting timed out. Stopping.", u->id); mount_enter_signal(m, MOUNT_MOUNTING_SIGTERM, false); break; case MOUNT_REMOUNTING: - log_warning("%s remounting timed out. Stopping.", u->meta.id); - mount_enter_signal(m, MOUNT_REMOUNTING_SIGTERM, false); + log_warning("%s remounting timed out. Stopping.", u->id); + m->reload_failure = true; + mount_enter_mounted(m, true); break; case MOUNT_UNMOUNTING: - log_warning("%s unmounting timed out. Stopping.", u->meta.id); + log_warning("%s unmounting timed out. Stopping.", u->id); mount_enter_signal(m, MOUNT_UNMOUNTING_SIGTERM, false); break; case MOUNT_MOUNTING_SIGTERM: if (m->exec_context.send_sigkill) { - log_warning("%s mounting timed out. Killing.", u->meta.id); + log_warning("%s mounting timed out. Killing.", u->id); mount_enter_signal(m, MOUNT_MOUNTING_SIGKILL, false); } else { - log_warning("%s mounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id); + log_warning("%s mounting timed out. Skipping SIGKILL. Ignoring.", u->id); if (m->from_proc_self_mountinfo) mount_enter_mounted(m, false); @@ -1171,10 +1318,10 @@ static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) { case MOUNT_REMOUNTING_SIGTERM: if (m->exec_context.send_sigkill) { - log_warning("%s remounting timed out. Killing.", u->meta.id); + log_warning("%s remounting timed out. Killing.", u->id); mount_enter_signal(m, MOUNT_REMOUNTING_SIGKILL, false); } else { - log_warning("%s remounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id); + log_warning("%s remounting timed out. Skipping SIGKILL. Ignoring.", u->id); if (m->from_proc_self_mountinfo) mount_enter_mounted(m, false); @@ -1185,10 +1332,10 @@ static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) { case MOUNT_UNMOUNTING_SIGTERM: if (m->exec_context.send_sigkill) { - log_warning("%s unmounting timed out. Killing.", u->meta.id); + log_warning("%s unmounting timed out. Killing.", u->id); mount_enter_signal(m, MOUNT_UNMOUNTING_SIGKILL, false); } else { - log_warning("%s unmounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id); + log_warning("%s unmounting timed out. Skipping SIGKILL. Ignoring.", u->id); if (m->from_proc_self_mountinfo) mount_enter_mounted(m, false); @@ -1200,7 +1347,7 @@ static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) { case MOUNT_MOUNTING_SIGKILL: case MOUNT_REMOUNTING_SIGKILL: case MOUNT_UNMOUNTING_SIGKILL: - log_warning("%s mount process still around after SIGKILL. Ignoring.", u->meta.id); + log_warning("%s mount process still around after SIGKILL. Ignoring.", u->id); if (m->from_proc_self_mountinfo) mount_enter_mounted(m, false); @@ -1238,9 +1385,7 @@ static int mount_add_one( /* Ignore API mount points. They should never be referenced in * dependencies ever. */ - if (mount_point_is_api(where)) - return 0; - if (mount_point_ignore(where)) + if (mount_point_is_api(where) || mount_point_ignore(where)) return 0; if (streq(fstype, "autofs")) @@ -1250,13 +1395,16 @@ static int mount_add_one( if (!is_path(where)) return 0; - if (!(e = unit_name_from_path(where, ".mount"))) + e = unit_name_from_path(where, ".mount"); + if (!e) return -ENOMEM; - if (!(u = manager_get_unit(m, e))) { + u = manager_get_unit(m, e); + if (!u) { delete = true; - if (!(u = unit_new(m))) { + u = unit_new(m, sizeof(Mount)); + if (!u) { free(e); return -ENOMEM; } @@ -1267,7 +1415,8 @@ static int mount_add_one( if (r < 0) goto fail; - if (!(MOUNT(u)->where = strdup(where))) { + MOUNT(u)->where = strdup(where); + if (!MOUNT(u)->where) { r = -ENOMEM; goto fail; } @@ -1330,7 +1479,7 @@ static int mount_find_pri(char *options) { char *end, *pri; unsigned long r; - if (!(pri = mount_test_option(options, "pri="))) + if (!(pri = mount_test_option(options, "pri"))) return 0; pri += 4; @@ -1389,7 +1538,7 @@ static int mount_load_etc_fstab(Manager *m) { what, NULL, pri, - !!mount_test_option(me->mnt_opts, MNTOPT_NOAUTO), + !!mount_test_option(me->mnt_opts, "noauto"), !!mount_test_option(me->mnt_opts, "nofail"), !!mount_test_option(me->mnt_opts, "comment=systemd.swapon"), false); @@ -1530,7 +1679,7 @@ fail: } void mount_fd_event(Manager *m, int events) { - Meta *meta; + Unit *meta; int r; assert(m); @@ -1544,7 +1693,7 @@ void mount_fd_event(Manager *m, int events) { log_error("Failed to reread /proc/self/mountinfo: %s", strerror(-r)); /* Reset flags, just in case, for later calls */ - LIST_FOREACH(units_per_type, meta, m->units_per_type[UNIT_MOUNT]) { + LIST_FOREACH(units_by_type, meta, m->units_by_type[UNIT_MOUNT]) { Mount *mount = (Mount*) meta; mount->is_mounted = mount->just_mounted = mount->just_changed = false; @@ -1555,7 +1704,7 @@ void mount_fd_event(Manager *m, int events) { manager_dispatch_load_queue(m); - LIST_FOREACH(units_per_type, meta, m->units_per_type[UNIT_MOUNT]) { + LIST_FOREACH(units_by_type, meta, m->units_by_type[UNIT_MOUNT]) { Mount *mount = (Mount*) meta; if (!mount->is_mounted) { @@ -1626,19 +1775,20 @@ static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError if (who == KILL_MAIN) { dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Mount units have no main processes"); - return -EINVAL; + return -ESRCH; } if (m->control_pid <= 0 && who == KILL_CONTROL) { dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill"); - return -ENOENT; + return -ESRCH; } - if (m->control_pid > 0) - if (kill(mode == KILL_PROCESS_GROUP ? -m->control_pid : m->control_pid, signo) < 0) - r = -errno; + if (who == KILL_CONTROL || who == KILL_ALL) + if (m->control_pid > 0) + if (kill(m->control_pid, signo) < 0) + r = -errno; - if (mode == KILL_CONTROL_GROUP) { + if (who == KILL_ALL && mode == KILL_CONTROL_GROUP) { int q; if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func))) @@ -1651,8 +1801,8 @@ static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError goto finish; } - if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, pid_set)) < 0) - if (r != -EAGAIN && r != -ESRCH && r != -ENOENT) + if ((q = cgroup_bonding_kill_list(UNIT(m)->cgroup_bondings, signo, false, pid_set)) < 0) + if (q != -EAGAIN && q != -ESRCH && q != -ENOENT) r = q; } @@ -1691,10 +1841,14 @@ DEFINE_STRING_TABLE_LOOKUP(mount_exec_command, MountExecCommand); const UnitVTable mount_vtable = { .suffix = ".mount", + .object_size = sizeof(Mount), + .sections = + "Unit\0" + "Mount\0" + "Install\0", .no_alias = true, .no_instances = true, - .no_isolate = true, .show_status = true, .init = mount_init,