X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmount.c;h=00780101a0c1edbced14f97a2ce6c0371416a33f;hp=08d5de28d7ebc54ee5a3b37f6a09d7c90211eecd;hb=715ac17a84f7d721dec613d86d83e671704fafcc;hpb=173a8d04fc3535b571fe4a0d4715c18be315a43a diff --git a/src/mount.c b/src/mount.c index 08d5de28d..00780101a 100644 --- a/src/mount.c +++ b/src/mount.c @@ -33,9 +33,10 @@ #include "strv.h" #include "mount-setup.h" #include "unit-name.h" -#include "mount.h" #include "dbus-mount.h" #include "special.h" +#include "bus-errors.h" +#include "exit-status.h" static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { [MOUNT_DEAD] = UNIT_INACTIVE, @@ -50,7 +51,7 @@ static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { [MOUNT_REMOUNTING_SIGKILL] = UNIT_RELOADING, [MOUNT_UNMOUNTING_SIGTERM] = UNIT_DEACTIVATING, [MOUNT_UNMOUNTING_SIGKILL] = UNIT_DEACTIVATING, - [MOUNT_MAINTENANCE] = UNIT_MAINTENANCE + [MOUNT_FAILED] = UNIT_FAILED }; static void mount_init(Unit *u) { @@ -63,6 +64,7 @@ static void mount_init(Unit *u) { m->directory_mode = 0755; exec_context_init(&m->exec_context); + m->exec_context.std_output = EXEC_OUTPUT_KMSG; /* We need to make sure that /bin/mount is always called in * the same process group as us, so that the autofs kernel @@ -97,12 +99,21 @@ static void mount_parameters_done(MountParameters *p) { static void mount_done(Unit *u) { Mount *m = MOUNT(u); + Meta *other; assert(m); free(m->where); m->where = NULL; + /* Try to detach us from the automount unit if there is any */ + LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_AUTOMOUNT]) { + Automount *a = (Automount*) other; + + if (a->mount == m) + a->mount = NULL; + } + mount_parameters_done(&m->parameters_etc_fstab); mount_parameters_done(&m->parameters_proc_self_mountinfo); mount_parameters_done(&m->parameters_fragment); @@ -119,14 +130,23 @@ static void mount_done(Unit *u) { static int mount_add_mount_links(Mount *m) { Meta *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; + /* 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]) { Mount *n = (Mount*) other; + MountParameters *pn; if (n == m) continue; @@ -134,6 +154,13 @@ static int mount_add_mount_links(Mount *m) { if (n->meta.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; + if (path_startswith(m->where, n->where)) { if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, UNIT(n), true)) < 0) @@ -145,12 +172,30 @@ static int mount_add_mount_links(Mount *m) { } else if (path_startswith(n->where, m->where)) { - if ((r = unit_add_dependency(UNIT(m), UNIT_BEFORE, UNIT(n), true)) < 0) + if ((r = unit_add_dependency(UNIT(n), UNIT_AFTER, UNIT(m), true)) < 0) return r; if (m->from_etc_fstab || m->from_fragment) if ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0) return r; + + } else if (pm && path_startswith(pm->what, n->where)) { + + 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; + + } 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; } } @@ -227,11 +272,11 @@ static char* mount_test_option(const char *haystack, const char *needle) { } static int mount_add_target_links(Mount *m) { - const char *target; + const char *target, *after = NULL; MountParameters *p; Unit *tu; int r; - bool noauto, handle, automount, user; + bool noauto, nofail, handle, automount; assert(m); @@ -243,20 +288,31 @@ static int mount_add_target_links(Mount *m) { return 0; noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO); - user = mount_test_option(p->options, "user") || mount_test_option(p->options, "users"); - handle = !!mount_test_option(p->options, "comment=systemd.mount") || + nofail = !!mount_test_option(p->options, "nofail"); + handle = + mount_test_option(p->options, "comment=systemd.mount") || + mount_test_option(p->options, "x-systemd-mount") || m->meta.manager->mount_auto; - automount = !!mount_test_option(p->options, "comment=systemd.automount"); + automount = + mount_test_option(p->options, "comment=systemd.automount") || + mount_test_option(p->options, "x-systemd-automount"); if (mount_test_option(p->options, "_netdev") || - fstype_is_network(p->fstype)) + (p->fstype && fstype_is_network(p->fstype))) { target = SPECIAL_REMOTE_FS_TARGET; - else + + if (m->meta.manager->running_as == MANAGER_SYSTEM) + after = SPECIAL_NETWORK_TARGET; + } else target = SPECIAL_LOCAL_FS_TARGET; if ((r = manager_load_unit(m->meta.manager, target, NULL, NULL, &tu)) < 0) return r; + if (after) + 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) { Unit *am; @@ -266,18 +322,35 @@ static int mount_add_target_links(Mount *m) { return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_WANTS, UNIT(am), true); } else { - if (!noauto && handle) - if (user || m->meta.manager->running_as == MANAGER_SYSTEM) - if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true)) < 0) - return r; + /* 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 ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true)) < 0) + return r; return unit_add_dependency(UNIT(m), UNIT_BEFORE, tu, true); } } +static bool mount_is_bind(MountParameters *p) { + assert(p); + + if (p->fstype && streq(p->fstype, "bind")) + return true; + + if (mount_test_option(p->options, "bind")) + return true; + + return false; +} + static int mount_add_device_links(Mount *m) { MountParameters *p; - bool nofail, noauto; + int r; assert(m); @@ -288,15 +361,48 @@ static int mount_add_device_links(Mount *m) { else return 0; - if (!p->what || path_equal(m->where, "/")) + if (!p->what) return 0; - noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO); - nofail = !!mount_test_option(p->options, "nofail"); + if (!mount_is_bind(p) && !path_equal(m->where, "/")) { + bool nofail, noauto; + + noauto = !!mount_test_option(p->options, MNTOPT_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) + return r; + } - return unit_add_node_link(UNIT(m), p->what, - !noauto && nofail && - UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM); + if (p->passno > 0 && + !mount_is_bind(p) && + UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM && + !path_equal(m->where, "/")) { + char *name; + Unit *fsck; + /* Let's add in the fsck service */ + + /* aka SPECIAL_FSCK_SERVICE */ + 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) { + log_warning("Failed to prepare unit %s: %s", name, strerror(-r)); + free(name); + return r; + } + + free(name); + + SERVICE(fsck)->fsck_passno = p->passno; + + if ((r = unit_add_two_dependencies(UNIT(m), UNIT_AFTER, UNIT_REQUIRES, fsck, true)) < 0) + return r; + } + + return 0; } static int mount_add_default_dependencies(Mount *m) { @@ -307,10 +413,10 @@ static int mount_add_default_dependencies(Mount *m) { if (m->meta.manager->running_as == MANAGER_SYSTEM && !path_equal(m->where, "/")) { - if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, SPECIAL_FSCK_TARGET, NULL, true)) < 0) + if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0) return r; - if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) + if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0) return r; } @@ -364,7 +470,8 @@ static int mount_load(Unit *u) { /* This is a new unit? Then let's add in some extras */ if (u->meta.load_state == UNIT_LOADED) { - const char *what = NULL; + if ((r = unit_add_exec_dependencies(u, &m->exec_context)) < 0) + return r; if (m->meta.fragment_path) m->from_fragment = true; @@ -379,13 +486,6 @@ static int mount_load(Unit *u) { if ((r = unit_set_description(u, m->where)) < 0) return r; - if (m->from_fragment && m->parameters_fragment.what) - what = m->parameters_fragment.what; - else if (m->from_etc_fstab && m->parameters_etc_fstab.what) - what = m->parameters_etc_fstab.what; - else if (m->from_proc_self_mountinfo && m->parameters_proc_self_mountinfo.what) - what = m->parameters_proc_self_mountinfo.what; - if ((r = mount_add_device_links(m)) < 0) return r; @@ -407,7 +507,7 @@ static int mount_load(Unit *u) { if ((r = mount_add_target_links(m)) < 0) return r; - if ((r = unit_add_default_cgroup(u)) < 0) + if ((r = unit_add_default_cgroups(u)) < 0) return r; if (m->meta.default_dependencies) @@ -464,7 +564,7 @@ static void mount_set_state(Mount *m, MountState state) { state == MOUNT_REMOUNTING_SIGKILL || state == MOUNT_UNMOUNTING_SIGTERM || state == MOUNT_UNMOUNTING_SIGKILL || - state == MOUNT_MAINTENANCE) + state == MOUNT_FAILED) mount_notify_automount(m, -ENODEV); if (state != old_state) @@ -473,7 +573,8 @@ static void mount_set_state(Mount *m, MountState state) { 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) { @@ -604,7 +705,7 @@ static void mount_enter_dead(Mount *m, bool success) { if (!success) m->failure = true; - mount_set_state(m, m->failure ? MOUNT_MAINTENANCE : MOUNT_DEAD); + mount_set_state(m, m->failure ? MOUNT_FAILED : MOUNT_DEAD); } static void mount_enter_mounted(Mount *m, bool success) { @@ -618,7 +719,8 @@ static void mount_enter_mounted(Mount *m, bool success) { static void mount_enter_signal(Mount *m, MountState state, bool success) { int r; - bool sent = false; + Set *pid_set = NULL; + bool wait_for_exit = false; assert(m); @@ -630,26 +732,39 @@ static void mount_enter_signal(Mount *m, MountState state, bool success) { state == MOUNT_UNMOUNTING_SIGTERM || state == MOUNT_REMOUNTING_SIGTERM) ? m->exec_context.kill_signal : SIGKILL; - if (m->exec_context.kill_mode == KILL_CONTROL_GROUP) { + if (m->control_pid > 0) { + if (kill_and_sigcont(m->exec_context.kill_mode == KILL_PROCESS_GROUP ? + -m->control_pid : + m->control_pid, sig) < 0 && errno != ESRCH) - if ((r = cgroup_bonding_kill_list(m->meta.cgroup_bondings, sig)) < 0) { - if (r != -EAGAIN && r != -ESRCH) - goto fail; - } else - sent = true; + log_warning("Failed to kill control process %li: %m", (long) m->control_pid); + else + wait_for_exit = true; } - if (!sent && m->control_pid > 0) - if (kill(m->exec_context.kill_mode == KILL_PROCESS ? - m->control_pid : - -m->control_pid, sig) < 0 && errno != ESRCH) { + if (m->exec_context.kill_mode == KILL_CONTROL_GROUP) { - r = -errno; + if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func))) { + r = -ENOMEM; goto fail; } + + /* Exclude the control pid from being killed via the cgroup */ + if (m->control_pid > 0) + 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, 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); + } } - if (sent) { + if (wait_for_exit) { if ((r = unit_watch_timer(UNIT(m), m->timeout_usec, &m->timer_watch)) < 0) goto fail; @@ -668,6 +783,9 @@ fail: mount_enter_mounted(m, false); else mount_enter_dead(m, false); + + if (pid_set) + set_free(pid_set); } static void mount_enter_unmounting(Mount *m, bool success) { @@ -718,7 +836,7 @@ static void mount_enter_mounting(Mount *m) { "/bin/mount", m->parameters_fragment.what, m->where, - "-t", m->parameters_fragment.fstype, + "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto", m->parameters_fragment.options ? "-o" : NULL, m->parameters_fragment.options, NULL); else if (m->from_etc_fstab) @@ -783,7 +901,7 @@ static void mount_enter_remounting(Mount *m, bool success) { "/bin/mount", m->parameters_fragment.what, m->where, - "-t", m->parameters_fragment.fstype, + "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto", "-o", o, NULL); @@ -798,10 +916,8 @@ static void mount_enter_remounting(Mount *m, bool success) { else r = -ENOENT; - if (r < 0) { - r = -ENOMEM; + if (r < 0) goto fail; - } mount_unwatch_control_pid(m); @@ -814,7 +930,8 @@ static void mount_enter_remounting(Mount *m, bool success) { fail: log_warning("%s failed to run 'remount' task: %s", m->meta.id, strerror(-r)); - mount_enter_mounted(m, false); + m->reload_failure = true; + mount_enter_mounted(m, true); } static int mount_start(Unit *u) { @@ -826,16 +943,16 @@ static int mount_start(Unit *u) { * please! */ if (m->state == MOUNT_UNMOUNTING || m->state == MOUNT_UNMOUNTING_SIGTERM || - m->state == MOUNT_UNMOUNTING_SIGKILL) + m->state == MOUNT_UNMOUNTING_SIGKILL || + m->state == MOUNT_MOUNTING_SIGTERM || + m->state == MOUNT_MOUNTING_SIGKILL) return -EAGAIN; /* Already on it! */ - if (m->state == MOUNT_MOUNTING || - m->state == MOUNT_MOUNTING_SIGTERM || - m->state == MOUNT_MOUNTING_SIGKILL) + if (m->state == MOUNT_MOUNTING) return 0; - assert(m->state == MOUNT_DEAD || m->state == MOUNT_MAINTENANCE); + assert(m->state == MOUNT_DEAD || m->state == MOUNT_FAILED); m->failure = false; mount_enter_mounting(m); @@ -850,14 +967,14 @@ static int mount_stop(Unit *u) { /* Already on it */ if (m->state == MOUNT_UNMOUNTING || m->state == MOUNT_UNMOUNTING_SIGKILL || - m->state == MOUNT_UNMOUNTING_SIGTERM) + m->state == MOUNT_UNMOUNTING_SIGTERM || + m->state == MOUNT_MOUNTING_SIGTERM || + m->state == MOUNT_MOUNTING_SIGKILL) return 0; assert(m->state == MOUNT_MOUNTING || m->state == MOUNT_MOUNTING_DONE || m->state == MOUNT_MOUNTED || - m->state == MOUNT_MOUNTING_SIGTERM || - m->state == MOUNT_MOUNTING_SIGKILL || m->state == MOUNT_REMOUNTING || m->state == MOUNT_REMOUNTING_SIGTERM || m->state == MOUNT_REMOUNTING_SIGKILL); @@ -981,7 +1098,7 @@ 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); + exec_status_exit(&m->control_command->exec_status, pid, code, status, m->exec_context.utmp_id); m->control_command = NULL; m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID; } @@ -1002,9 +1119,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); @@ -1014,6 +1128,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: @@ -1051,7 +1177,8 @@ static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) { case MOUNT_REMOUNTING: log_warning("%s remounting timed out. Stopping.", u->meta.id); - mount_enter_signal(m, MOUNT_REMOUNTING_SIGTERM, false); + m->reload_failure = true; + mount_enter_mounted(m, true); break; case MOUNT_UNMOUNTING: @@ -1060,18 +1187,45 @@ static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) { break; case MOUNT_MOUNTING_SIGTERM: - log_warning("%s mounting timed out. Killing.", u->meta.id); - mount_enter_signal(m, MOUNT_MOUNTING_SIGKILL, false); + if (m->exec_context.send_sigkill) { + log_warning("%s mounting timed out. Killing.", u->meta.id); + mount_enter_signal(m, MOUNT_MOUNTING_SIGKILL, false); + } else { + log_warning("%s mounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id); + + if (m->from_proc_self_mountinfo) + mount_enter_mounted(m, false); + else + mount_enter_dead(m, false); + } break; case MOUNT_REMOUNTING_SIGTERM: - log_warning("%s remounting timed out. Killing.", u->meta.id); - mount_enter_signal(m, MOUNT_REMOUNTING_SIGKILL, false); + if (m->exec_context.send_sigkill) { + log_warning("%s remounting timed out. Killing.", u->meta.id); + mount_enter_signal(m, MOUNT_REMOUNTING_SIGKILL, false); + } else { + log_warning("%s remounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id); + + if (m->from_proc_self_mountinfo) + mount_enter_mounted(m, false); + else + mount_enter_dead(m, false); + } break; case MOUNT_UNMOUNTING_SIGTERM: - log_warning("%s unmounting timed out. Killing.", u->meta.id); - mount_enter_signal(m, MOUNT_UNMOUNTING_SIGKILL, false); + if (m->exec_context.send_sigkill) { + log_warning("%s unmounting timed out. Killing.", u->meta.id); + mount_enter_signal(m, MOUNT_UNMOUNTING_SIGKILL, false); + } else { + log_warning("%s unmounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id); + + if (m->from_proc_self_mountinfo) + mount_enter_mounted(m, false); + else + mount_enter_dead(m, false); + } break; case MOUNT_MOUNTING_SIGKILL: @@ -1096,6 +1250,7 @@ static int mount_add_one( const char *where, const char *options, const char *fstype, + int passno, bool from_proc_self_mountinfo, bool set_flags) { int r; @@ -1116,6 +1271,8 @@ static int mount_add_one( * dependencies ever. */ if (mount_point_is_api(where)) return 0; + if (mount_point_ignore(where)) + return 0; if (streq(fstype, "autofs")) return 0; @@ -1183,6 +1340,8 @@ static int mount_add_one( free(p->fstype); p->fstype = f; + p->passno = passno; + unit_add_to_dbus_queue(u); return 0; @@ -1198,56 +1357,6 @@ fail: return r; } -static char *fstab_node_to_udev_node(char *p) { - char *dn, *t, *u; - int r; - - /* FIXME: to follow udev's logic 100% we need to leave valid - * UTF8 chars unescaped */ - - if (startswith(p, "LABEL=")) { - - if (!(u = unquote(p+6, '"'))) - return NULL; - - t = xescape(u, "/ "); - free(u); - - if (!t) - return NULL; - - r = asprintf(&dn, "/dev/disk/by-label/%s", t); - free(t); - - if (r < 0) - return NULL; - - return dn; - } - - if (startswith(p, "UUID=")) { - - if (!(u = unquote(p+5, '"'))) - return NULL; - - t = xescape(u, "/ "); - free(u); - - if (!t) - return NULL; - - r = asprintf(&dn, "/dev/disk/by-uuid/%s", ascii_strlower(t)); - free(t); - - if (r < 0) - return NULL; - - return dn; - } - - return strdup(p); -} - static int mount_find_pri(char *options) { char *end, *pri; unsigned long r; @@ -1271,7 +1380,7 @@ static int mount_find_pri(char *options) { static int mount_load_etc_fstab(Manager *m) { FILE *f; - int r; + int r = 0; struct mntent* me; assert(m); @@ -1282,6 +1391,7 @@ static int mount_load_etc_fstab(Manager *m) { while ((me = getmntent(f))) { char *where, *what; + int k; if (!(what = fstab_node_to_udev_node(me->mnt_fsname))) { r = -ENOMEM; @@ -1304,26 +1414,26 @@ static int mount_load_etc_fstab(Manager *m) { int pri; if ((pri = mount_find_pri(me->mnt_opts)) < 0) - r = pri; + k = pri; else - r = swap_add_one(m, + k = swap_add_one(m, what, + NULL, pri, !!mount_test_option(me->mnt_opts, MNTOPT_NOAUTO), !!mount_test_option(me->mnt_opts, "nofail"), !!mount_test_option(me->mnt_opts, "comment=systemd.swapon"), false); } else - r = mount_add_one(m, what, where, me->mnt_opts, me->mnt_type, false, false); + k = mount_add_one(m, what, where, me->mnt_opts, me->mnt_type, me->mnt_passno, false, false); free(what); free(where); if (r < 0) - goto finish; + r = k; } - r = 0; finish: endmntent(f); @@ -1331,14 +1441,15 @@ finish: } static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { - int r; + int r = 0; + unsigned i; char *device, *path, *options, *options2, *fstype, *d, *p, *o; assert(m); rewind(m->proc_self_mountinfo); - for (;;) { + for (i = 1;; i++) { int k; device = path = options = options2 = fstype = d = p = o = NULL; @@ -1351,7 +1462,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { "%ms " /* (5) mount point */ "%ms" /* (6) mount options */ "%*[^-]" /* (7) optional fields */ - "- " /* (8) seperator */ + "- " /* (8) separator */ "%ms " /* (9) file system type */ "%ms" /* (10) mount source */ "%ms" /* (11) mount options 2 */ @@ -1365,8 +1476,8 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { if (k == EOF) break; - r = -EBADMSG; - goto finish; + log_warning("Failed to parse /proc/self/mountinfo:%u.", i); + goto clean_up; } if (asprintf(&o, "%s,%s", options, options2) < 0) { @@ -1380,9 +1491,10 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { goto finish; } - if ((r = mount_add_one(m, d, p, o, fstype, true, set_flags)) < 0) - goto finish; + if ((k = mount_add_one(m, d, p, o, fstype, 0, true, set_flags)) < 0) + r = k; +clean_up: free(device); free(path); free(options); @@ -1393,8 +1505,6 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { free(o); } - r = 0; - finish: free(device); free(path); @@ -1430,7 +1540,7 @@ static int mount_enumerate(Manager *m) { m->mount_watch.fd = fileno(m->proc_self_mountinfo); zero(ev); - ev.events = EPOLLERR; + ev.events = EPOLLPRI; ev.data.ptr = &m->mount_watch; if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->mount_watch.fd, &ev) < 0) @@ -1455,7 +1565,7 @@ void mount_fd_event(Manager *m, int events) { int r; assert(m); - assert(events == EPOLLERR); + assert(events & EPOLLPRI); /* The manager calls this for every fd event happening on the * /proc/self/mountinfo file, which informs us about mounting @@ -1498,12 +1608,12 @@ void mount_fd_event(Manager *m, int events) { } else if (mount->just_mounted || mount->just_changed) { - /* New or changed entrymount */ + /* New or changed mount entry */ switch (mount->state) { case MOUNT_DEAD: - case MOUNT_MAINTENANCE: + case MOUNT_FAILED: mount_enter_mounted(mount, true); break; @@ -1527,17 +1637,63 @@ void mount_fd_event(Manager *m, int events) { } } -static void mount_reset_maintenance(Unit *u) { +static void mount_reset_failed(Unit *u) { Mount *m = MOUNT(u); assert(m); - if (m->state == MOUNT_MAINTENANCE) + if (m->state == MOUNT_FAILED) mount_set_state(m, MOUNT_DEAD); m->failure = false; } +static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *error) { + Mount *m = MOUNT(u); + int r = 0; + Set *pid_set = NULL; + + assert(m); + + if (who == KILL_MAIN) { + dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Mount units have no main processes"); + return -EINVAL; + } + + if (m->control_pid <= 0 && who == KILL_CONTROL) { + dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill"); + return -ENOENT; + } + + if (m->control_pid > 0) + if (kill(mode == KILL_PROCESS_GROUP ? -m->control_pid : m->control_pid, signo) < 0) + r = -errno; + + if (mode == KILL_CONTROL_GROUP) { + int q; + + if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func))) + return -ENOMEM; + + /* Exclude the control pid from being killed via the cgroup */ + if (m->control_pid > 0) + if ((q = set_put(pid_set, LONG_TO_PTR(m->control_pid))) < 0) { + r = q; + goto finish; + } + + if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, false, pid_set)) < 0) + if (r != -EAGAIN && r != -ESRCH && r != -ENOENT) + r = q; + } + +finish: + if (pid_set) + set_free(pid_set); + + return r; +} + static const char* const mount_state_table[_MOUNT_STATE_MAX] = { [MOUNT_DEAD] = "dead", [MOUNT_MOUNTING] = "mounting", @@ -1551,7 +1707,7 @@ static const char* const mount_state_table[_MOUNT_STATE_MAX] = { [MOUNT_REMOUNTING_SIGKILL] = "remounting-sigkill", [MOUNT_UNMOUNTING_SIGTERM] = "unmounting-sigterm", [MOUNT_UNMOUNTING_SIGKILL] = "unmounting-sigkill", - [MOUNT_MAINTENANCE] = "maintenance" + [MOUNT_FAILED] = "failed" }; DEFINE_STRING_TABLE_LOOKUP(mount_state, MountState); @@ -1584,6 +1740,8 @@ const UnitVTable mount_vtable = { .stop = mount_stop, .reload = mount_reload, + .kill = mount_kill, + .serialize = mount_serialize, .deserialize_item = mount_deserialize_item, @@ -1595,7 +1753,7 @@ const UnitVTable mount_vtable = { .sigchld_event = mount_sigchld_event, .timer_event = mount_timer_event, - .reset_maintenance = mount_reset_maintenance, + .reset_failed = mount_reset_failed, .bus_interface = "org.freedesktop.systemd1.Mount", .bus_message_handler = bus_mount_message_handler,