chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: when sending journal data via file, place it in /dev/shm, to allow early...
[elogind.git]
/
src
/
swap.c
diff --git
a/src/swap.c
b/src/swap.c
index f59b0fb18d6561d157f1a1d55bfed9f7a4786e4b..b4a5b3c084794320f71dd5cac11ab899d9601431 100644
(file)
--- a/
src/swap.c
+++ b/
src/swap.c
@@
-37,6
+37,7
@@
#include "special.h"
#include "bus-errors.h"
#include "exit-status.h"
#include "special.h"
#include "bus-errors.h"
#include "exit-status.h"
+#include "def.h"
static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
[SWAP_DEAD] = UNIT_INACTIVE,
static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
[SWAP_DEAD] = UNIT_INACTIVE,
@@
-61,34
+62,37
@@
static void swap_unset_proc_swaps(Swap *s) {
/* Remove this unit from the chain of swaps which share the
* same kernel swap device. */
/* Remove this unit from the chain of swaps which share the
* same kernel swap device. */
- first = hashmap_get(
s->meta.
manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what);
+ first = hashmap_get(
UNIT(s)->
manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what);
LIST_REMOVE(Swap, same_proc_swaps, first, s);
if (first)
LIST_REMOVE(Swap, same_proc_swaps, first, s);
if (first)
- hashmap_remove_and_replace(
s->meta.
manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what, first->parameters_proc_swaps.what, first);
+ hashmap_remove_and_replace(
UNIT(s)->
manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what, first->parameters_proc_swaps.what, first);
else
else
- hashmap_remove(
s->meta.
manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what);
+ hashmap_remove(
UNIT(s)->
manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what);
free(s->parameters_proc_swaps.what);
s->parameters_proc_swaps.what = NULL;
}
free(s->parameters_proc_swaps.what);
s->parameters_proc_swaps.what = NULL;
}
-
static void swap_init(Unit *u) {
+static void swap_init(Unit *u) {
Swap *s = SWAP(u);
assert(s);
Swap *s = SWAP(u);
assert(s);
- assert(
s->meta.
load_state == UNIT_STUB);
+ assert(
UNIT(s)->
load_state == UNIT_STUB);
s->timeout_usec = DEFAULT_TIMEOUT_USEC;
exec_context_init(&s->exec_context);
s->timeout_usec = DEFAULT_TIMEOUT_USEC;
exec_context_init(&s->exec_context);
- s->exec_context.std_output = EXEC_OUTPUT_KMSG;
+ s->exec_context.std_output = u->manager->default_std_output;
+ s->exec_context.std_error = u->manager->default_std_error;
s->parameters_etc_fstab.priority = s->parameters_proc_swaps.priority = s->parameters_fragment.priority = -1;
s->timer_watch.type = WATCH_INVALID;
s->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
s->parameters_etc_fstab.priority = s->parameters_proc_swaps.priority = s->parameters_fragment.priority = -1;
s->timer_watch.type = WATCH_INVALID;
s->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
+
+ UNIT(s)->ignore_on_isolate = true;
}
static void swap_unwatch_control_pid(Swap *s) {
}
static void swap_unwatch_control_pid(Swap *s) {
@@
-130,8
+134,8
@@
int swap_add_one_mount_link(Swap *s, Mount *m) {
assert(s);
assert(m);
assert(s);
assert(m);
- if (
s->meta.
load_state != UNIT_LOADED ||
-
m->meta.
load_state != UNIT_LOADED)
+ if (
UNIT(s)->
load_state != UNIT_LOADED ||
+
UNIT(m)->
load_state != UNIT_LOADED)
return 0;
if (is_device_path(s->what))
return 0;
if (is_device_path(s->what))
@@
-147,13
+151,13
@@
int swap_add_one_mount_link(Swap *s, Mount *m) {
}
static int swap_add_mount_links(Swap *s) {
}
static int swap_add_mount_links(Swap *s) {
-
Meta
*other;
+
Unit
*other;
int r;
assert(s);
int r;
assert(s);
- LIST_FOREACH(units_
per_type, other, s->meta.manager->units_per
_type[UNIT_MOUNT])
- if ((r = swap_add_one_mount_link(s,
(Mount*) other
)) < 0)
+ LIST_FOREACH(units_
by_type, other, UNIT(s)->manager->units_by
_type[UNIT_MOUNT])
+ if ((r = swap_add_one_mount_link(s,
MOUNT(other)
)) < 0)
return r;
return 0;
return r;
return 0;
@@
-173,14
+177,14
@@
static int swap_add_target_links(Swap *s) {
else
return 0;
else
return 0;
- if ((r = manager_load_unit(
s->meta.
manager, SPECIAL_SWAP_TARGET, NULL, NULL, &tu)) < 0)
+ if ((r = manager_load_unit(
UNIT(s)->
manager, SPECIAL_SWAP_TARGET, NULL, NULL, &tu)) < 0)
return r;
if (!p->noauto &&
!p->nofail &&
return r;
if (!p->noauto &&
!p->nofail &&
- (p->handle ||
s->meta.
manager->swap_auto) &&
+ (p->handle ||
UNIT(s)->
manager->swap_auto) &&
s->from_etc_fstab &&
s->from_etc_fstab &&
-
s->meta.
manager->running_as == MANAGER_SYSTEM)
+
UNIT(s)->
manager->running_as == MANAGER_SYSTEM)
if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
return r;
if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
return r;
@@
-205,7
+209,7
@@
static int swap_add_device_links(Swap *s) {
if (is_device_path(s->what))
return unit_add_node_link(UNIT(s), s->what,
!p->noauto && p->nofail &&
if (is_device_path(s->what))
return unit_add_node_link(UNIT(s), s->what,
!p->noauto && p->nofail &&
-
s->meta.
manager->running_as == MANAGER_SYSTEM);
+
UNIT(s)->
manager->running_as == MANAGER_SYSTEM);
else
/* File based swap devices need to be ordered after
* remount-rootfs.service, since they might need a
else
/* File based swap devices need to be ordered after
* remount-rootfs.service, since they might need a
@@
-218,7
+222,7
@@
static int swap_add_default_dependencies(Swap *s) {
assert(s);
assert(s);
- if (
s->meta.
manager->running_as == MANAGER_SYSTEM) {
+ if (
UNIT(s)->
manager->running_as == MANAGER_SYSTEM) {
if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
@@
-231,7
+235,7
@@
static int swap_verify(Swap *s) {
bool b;
char *e;
bool b;
char *e;
- if (
s->meta.
load_state != UNIT_LOADED)
+ if (
UNIT(s)->
load_state != UNIT_LOADED)
return 0;
if (!(e = unit_name_from_path(s->what, ".swap")))
return 0;
if (!(e = unit_name_from_path(s->what, ".swap")))
@@
-241,12
+245,12
@@
static int swap_verify(Swap *s) {
free(e);
if (!b) {
free(e);
if (!b) {
- log_error("%s: Value of \"What\" and unit name do not match, not loading.\n",
s->meta.
id);
+ log_error("%s: Value of \"What\" and unit name do not match, not loading.\n",
UNIT(s)->
id);
return -EINVAL;
}
if (s->exec_context.pam_name && s->exec_context.kill_mode != KILL_CONTROL_GROUP) {
return -EINVAL;
}
if (s->exec_context.pam_name && s->exec_context.kill_mode != KILL_CONTROL_GROUP) {
- log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.",
s->meta.
id);
+ log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.",
UNIT(s)->
id);
return -EINVAL;
}
return -EINVAL;
}
@@
-258,17
+262,17
@@
static int swap_load(Unit *u) {
Swap *s = SWAP(u);
assert(s);
Swap *s = SWAP(u);
assert(s);
- assert(u->
meta.
load_state == UNIT_STUB);
+ assert(u->load_state == UNIT_STUB);
/* Load a .swap file */
if ((r = unit_load_fragment_and_dropin_optional(u)) < 0)
return r;
/* Load a .swap 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) {
if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
return r;
if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
return r;
- if (
s->meta.
fragment_path)
+ if (
UNIT(s)->
fragment_path)
s->from_fragment = true;
if (!s->what) {
s->from_fragment = true;
if (!s->what) {
@@
-279,7
+283,7
@@
static int swap_load(Unit *u) {
else if (s->parameters_proc_swaps.what)
s->what = strdup(s->parameters_proc_swaps.what);
else
else if (s->parameters_proc_swaps.what)
s->what = strdup(s->parameters_proc_swaps.what);
else
- s->what = unit_name_to_path(u->
meta.
id);
+ s->what = unit_name_to_path(u->id);
if (!s->what)
return -ENOMEM;
if (!s->what)
return -ENOMEM;
@@
-287,7
+291,7
@@
static int swap_load(Unit *u) {
path_kill_slashes(s->what);
path_kill_slashes(s->what);
- if (!
s->meta.
description)
+ if (!
UNIT(s)->
description)
if ((r = unit_set_description(u, s->what)) < 0)
return r;
if ((r = unit_set_description(u, s->what)) < 0)
return r;
@@
-303,7
+307,7
@@
static int swap_load(Unit *u) {
if ((r = unit_add_default_cgroups(u)) < 0)
return r;
if ((r = unit_add_default_cgroups(u)) < 0)
return r;
- if (
s->meta.
default_dependencies)
+ if (
UNIT(s)->
default_dependencies)
if ((r = swap_add_default_dependencies(s)) < 0)
return r;
}
if ((r = swap_add_default_dependencies(s)) < 0)
return r;
}
@@
-330,7
+334,8
@@
int swap_add_one(
assert(m);
assert(what);
assert(m);
assert(what);
- if (!(e = unit_name_from_path(what, ".swap")))
+ e = unit_name_from_path(what, ".swap");
+ if (!e)
return -ENOMEM;
u = manager_get_unit(m, e);
return -ENOMEM;
u = manager_get_unit(m, e);
@@
-344,15
+349,18
@@
int swap_add_one(
if (!u) {
delete = true;
if (!u) {
delete = true;
- if (!(u = unit_new(m))) {
+ u = unit_new(m, sizeof(Swap));
+ if (!u) {
free(e);
return -ENOMEM;
}
free(e);
return -ENOMEM;
}
- if ((r = unit_add_name(u, e)) < 0)
+ r = unit_add_name(u, e);
+ if (r < 0)
goto fail;
goto fail;
- if (!(SWAP(u)->what = strdup(what))) {
+ SWAP(u)->what = strdup(what);
+ if (!SWAP(u)->what) {
r = -ENOMEM;
goto fail;
}
r = -ENOMEM;
goto fail;
}
@@
-502,7
+510,7
@@
static void swap_set_state(Swap *s, SwapState state) {
if (state != old_state)
log_debug("%s changed %s -> %s",
if (state != old_state)
log_debug("%s changed %s -> %s",
-
s->meta.
id,
+
UNIT(s)->
id,
swap_state_to_string(old_state),
swap_state_to_string(state));
swap_state_to_string(old_state),
swap_state_to_string(state));
@@
-604,12
+612,13
@@
static int swap_spawn(Swap *s, ExecCommand *c, pid_t *_pid) {
NULL,
&s->exec_context,
NULL, 0,
NULL,
&s->exec_context,
NULL, 0,
-
s->meta.
manager->environment,
+
UNIT(s)->
manager->environment,
true,
true,
true,
true,
true,
true,
- s->meta.manager->confirm_spawn,
- s->meta.cgroup_bondings,
+ UNIT(s)->manager->confirm_spawn,
+ UNIT(s)->cgroup_bondings,
+ UNIT(s)->cgroup_attributes,
&pid)) < 0)
goto fail;
&pid)) < 0)
goto fail;
@@
-660,9
+669,7
@@
static void swap_enter_signal(Swap *s, SwapState state, bool success) {
state == SWAP_DEACTIVATING_SIGTERM) ? s->exec_context.kill_signal : SIGKILL;
if (s->control_pid > 0) {
state == SWAP_DEACTIVATING_SIGTERM) ? s->exec_context.kill_signal : SIGKILL;
if (s->control_pid > 0) {
- if (kill_and_sigcont(s->exec_context.kill_mode == KILL_PROCESS_GROUP ?
- -s->control_pid :
- s->control_pid, sig) < 0 && errno != ESRCH)
+ if (kill_and_sigcont(s->control_pid, sig) < 0 && errno != ESRCH)
log_warning("Failed to kill control process %li: %m", (long) s->control_pid);
else
log_warning("Failed to kill control process %li: %m", (long) s->control_pid);
else
@@
-681,13
+688,14
@@
static void swap_enter_signal(Swap *s, SwapState state, bool success) {
if ((r = set_put(pid_set, LONG_TO_PTR(s->control_pid))) < 0)
goto fail;
if ((r = set_put(pid_set, LONG_TO_PTR(s->control_pid))) < 0)
goto fail;
- if ((r = cgroup_bonding_kill_list(
s->meta.
cgroup_bondings, sig, true, pid_set)) < 0) {
+ if ((r = cgroup_bonding_kill_list(
UNIT(s)->
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 (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;
}
}
}
}
@@
-702,7
+710,7
@@
static void swap_enter_signal(Swap *s, SwapState state, bool success) {
return;
fail:
return;
fail:
- log_warning("%s failed to kill processes: %s",
s->meta.
id, strerror(-r));
+ log_warning("%s failed to kill processes: %s",
UNIT(s)->
id, strerror(-r));
swap_enter_dead(s, false);
swap_enter_dead(s, false);
@@
-758,7
+766,7
@@
static void swap_enter_activating(Swap *s) {
return;
fail:
return;
fail:
- log_warning("%s failed to run 'swapon' task: %s",
s->meta.
id, strerror(-r));
+ log_warning("%s failed to run 'swapon' task: %s",
UNIT(s)->
id, strerror(-r));
swap_enter_dead(s, false);
}
swap_enter_dead(s, false);
}
@@
-790,7
+798,7
@@
static void swap_enter_deactivating(Swap *s, bool success) {
return;
fail:
return;
fail:
- log_warning("%s failed to run 'swapoff' task: %s",
s->meta.
id, strerror(-r));
+ log_warning("%s failed to run 'swapoff' task: %s",
UNIT(s)->
id, strerror(-r));
swap_enter_active(s, false);
}
swap_enter_active(s, false);
}
@@
-938,13
+946,13
@@
static void swap_sigchld_event(Unit *u, pid_t pid, int code, int status) {
s->failure = s->failure || !success;
if (s->control_command) {
s->failure = s->failure || !success;
if (s->control_command) {
- exec_status_exit(&s->control_command->exec_status,
pid, code, status, s->exec_context.utmp_id
);
+ exec_status_exit(&s->control_command->exec_status,
&s->exec_context, pid, code, status
);
s->control_command = NULL;
s->control_command_id = _SWAP_EXEC_COMMAND_INVALID;
}
log_full(success ? LOG_DEBUG : LOG_NOTICE,
s->control_command = NULL;
s->control_command_id = _SWAP_EXEC_COMMAND_INVALID;
}
log_full(success ? LOG_DEBUG : LOG_NOTICE,
- "%s swap process exited, code=%s status=%i", u->
meta.
id, sigchld_code_to_string(code), status);
+ "%s swap process exited, code=%s status=%i", u->id, sigchld_code_to_string(code), status);
switch (s->state) {
switch (s->state) {
@@
-977,7
+985,7
@@
static void swap_sigchld_event(Unit *u, pid_t pid, int code, int status) {
/* Request a reload of /proc/swaps, so that following units
* can follow our state change */
/* Request a reload of /proc/swaps, so that following units
* can follow our state change */
- u->m
eta.m
anager->request_reload = true;
+ u->manager->request_reload = true;
}
static void swap_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
}
static void swap_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
@@
-990,38
+998,38
@@
static void swap_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
switch (s->state) {
case SWAP_ACTIVATING:
switch (s->state) {
case SWAP_ACTIVATING:
- log_warning("%s activation timed out. Stopping.", u->
meta.
id);
+ log_warning("%s activation timed out. Stopping.", u->id);
swap_enter_signal(s, SWAP_ACTIVATING_SIGTERM, false);
break;
case SWAP_DEACTIVATING:
swap_enter_signal(s, SWAP_ACTIVATING_SIGTERM, false);
break;
case SWAP_DEACTIVATING:
- log_warning("%s deactivation timed out. Stopping.", u->
meta.
id);
+ log_warning("%s deactivation timed out. Stopping.", u->id);
swap_enter_signal(s, SWAP_DEACTIVATING_SIGTERM, false);
break;
case SWAP_ACTIVATING_SIGTERM:
if (s->exec_context.send_sigkill) {
swap_enter_signal(s, SWAP_DEACTIVATING_SIGTERM, false);
break;
case SWAP_ACTIVATING_SIGTERM:
if (s->exec_context.send_sigkill) {
- log_warning("%s activation timed out. Killing.", u->
meta.
id);
+ log_warning("%s activation timed out. Killing.", u->id);
swap_enter_signal(s, SWAP_ACTIVATING_SIGKILL, false);
} else {
swap_enter_signal(s, SWAP_ACTIVATING_SIGKILL, false);
} else {
- log_warning("%s activation timed out. Skipping SIGKILL. Ignoring.", u->
meta.
id);
+ log_warning("%s activation timed out. Skipping SIGKILL. Ignoring.", u->id);
swap_enter_dead(s, false);
}
break;
case SWAP_DEACTIVATING_SIGTERM:
if (s->exec_context.send_sigkill) {
swap_enter_dead(s, false);
}
break;
case SWAP_DEACTIVATING_SIGTERM:
if (s->exec_context.send_sigkill) {
- log_warning("%s deactivation timed out. Killing.", u->
meta.
id);
+ log_warning("%s deactivation timed out. Killing.", u->id);
swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, false);
} else {
swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, false);
} else {
- log_warning("%s deactivation timed out. Skipping SIGKILL. Ignoring.", u->
meta.
id);
+ log_warning("%s deactivation timed out. Skipping SIGKILL. Ignoring.", u->id);
swap_enter_dead(s, false);
}
break;
case SWAP_ACTIVATING_SIGKILL:
case SWAP_DEACTIVATING_SIGKILL:
swap_enter_dead(s, false);
}
break;
case SWAP_ACTIVATING_SIGKILL:
case SWAP_DEACTIVATING_SIGKILL:
- log_warning("%s swap process still around after SIGKILL. Ignoring.", u->
meta.
id);
+ log_warning("%s swap process still around after SIGKILL. Ignoring.", u->id);
swap_enter_dead(s, false);
break;
swap_enter_dead(s, false);
break;
@@
-1088,7
+1096,7
@@
int swap_dispatch_reload(Manager *m) {
}
int swap_fd_event(Manager *m, int events) {
}
int swap_fd_event(Manager *m, int events) {
-
Meta *meta
;
+
Unit *u
;
int r;
assert(m);
int r;
assert(m);
@@
-1098,8
+1106,8
@@
int swap_fd_event(Manager *m, int events) {
log_error("Failed to reread /proc/swaps: %s", strerror(-r));
/* Reset flags, just in case, for late calls */
log_error("Failed to reread /proc/swaps: %s", strerror(-r));
/* Reset flags, just in case, for late calls */
- LIST_FOREACH(units_
per_type, meta, m->units_per
_type[UNIT_SWAP]) {
- Swap *swap =
(Swap*) meta
;
+ LIST_FOREACH(units_
by_type, u, m->units_by
_type[UNIT_SWAP]) {
+ Swap *swap =
SWAP(u)
;
swap->is_active = swap->just_activated = false;
}
swap->is_active = swap->just_activated = false;
}
@@
-1109,8
+1117,8
@@
int swap_fd_event(Manager *m, int events) {
manager_dispatch_load_queue(m);
manager_dispatch_load_queue(m);
- LIST_FOREACH(units_
per_type, meta, m->units_per
_type[UNIT_SWAP]) {
- Swap *swap =
(Swap*) meta
;
+ LIST_FOREACH(units_
by_type, u, m->units_by
_type[UNIT_SWAP]) {
+ Swap *swap =
SWAP(u)
;
if (!swap->is_active) {
/* This has just been deactivated */
if (!swap->is_active) {
/* This has just been deactivated */
@@
-1235,7
+1243,7
@@
static int swap_enumerate(Manager *m) {
if (!m->proc_swaps) {
if (!(m->proc_swaps = fopen("/proc/swaps", "re")))
if (!m->proc_swaps) {
if (!(m->proc_swaps = fopen("/proc/swaps", "re")))
- return -errno;
+ return
(errno == ENOENT) ? 0 :
-errno;
m->swap_watch.type = WATCH_SWAP;
m->swap_watch.fd = fileno(m->proc_swaps);
m->swap_watch.type = WATCH_SWAP;
m->swap_watch.fd = fileno(m->proc_swaps);
@@
-1276,19
+1284,20
@@
static int swap_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *
if (who == KILL_MAIN) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Swap units have no main processes");
if (who == KILL_MAIN) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Swap units have no main processes");
- return -E
INVAL
;
+ return -E
SRCH
;
}
if (s->control_pid <= 0 && who == KILL_CONTROL) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
}
if (s->control_pid <= 0 && who == KILL_CONTROL) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
- return -E
NOENT
;
+ return -E
SRCH
;
}
}
- if (s->control_pid > 0)
- if (kill(mode == KILL_PROCESS_GROUP ? -s->control_pid : s->control_pid, signo) < 0)
- r = -errno;
+ if (who == KILL_CONTROL || who == KILL_ALL)
+ if (s->control_pid > 0)
+ if (kill(s->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)))
int q;
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
@@
-1301,8
+1310,8
@@
static int swap_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *
goto finish;
}
goto finish;
}
- if ((q = cgroup_bonding_kill_list(
s->meta.
cgroup_bondings, signo, false, pid_set)) < 0)
- if (
r != -EAGAIN && r != -ESRCH && r
!= -ENOENT)
+ if ((q = cgroup_bonding_kill_list(
UNIT(s)->
cgroup_bondings, signo, false, pid_set)) < 0)
+ if (
q != -EAGAIN && q != -ESRCH && q
!= -ENOENT)
r = q;
}
r = q;
}
@@
-1336,10
+1345,14
@@
DEFINE_STRING_TABLE_LOOKUP(swap_exec_command, SwapExecCommand);
const UnitVTable swap_vtable = {
.suffix = ".swap",
const UnitVTable swap_vtable = {
.suffix = ".swap",
+ .object_size = sizeof(Swap),
+ .sections =
+ "Unit\0"
+ "Swap\0"
+ "Install\0",
.no_alias = true,
.no_instances = true,
.no_alias = true,
.no_instances = true,
- .no_isolate = true,
.show_status = true,
.init = swap_init,
.show_status = true,
.init = swap_init,