chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: call udev_device_get_is_initialized() to trigger lazy loading, as a temporary...
[elogind.git]
/
src
/
swap.c
diff --git
a/src/swap.c
b/src/swap.c
index c32f60810c0f17444d12861e7080c4e10ed16bac..7675e6af21c9e10c5bcc89acb8c633a250e0db45 100644
(file)
--- a/
src/swap.c
+++ b/
src/swap.c
@@
-90,6
+90,8
@@
static void swap_unset_proc_swaps(Swap *s) {
s->timer_watch.type = WATCH_INVALID;
s->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
s->timer_watch.type = WATCH_INVALID;
s->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
+
+ s->meta.ignore_on_isolate = true;
}
static void swap_unwatch_control_pid(Swap *s) {
}
static void swap_unwatch_control_pid(Swap *s) {
@@
-153,7
+155,7
@@
static int swap_add_mount_links(Swap *s) {
assert(s);
assert(s);
- LIST_FOREACH(units_
per_type, other, s->meta.manager->units_per
_type[UNIT_MOUNT])
+ LIST_FOREACH(units_
by_type, other, s->meta.manager->units_by
_type[UNIT_MOUNT])
if ((r = swap_add_one_mount_link(s, (Mount*) other)) < 0)
return r;
if ((r = swap_add_one_mount_link(s, (Mount*) other)) < 0)
return r;
@@
-938,7
+940,7
@@
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;
}
s->control_command = NULL;
s->control_command_id = _SWAP_EXEC_COMMAND_INVALID;
}
@@
-1098,7
+1100,7
@@
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]) {
+ LIST_FOREACH(units_
by_type, meta, m->units_by
_type[UNIT_SWAP]) {
Swap *swap = (Swap*) meta;
swap->is_active = swap->just_activated = false;
Swap *swap = (Swap*) meta;
swap->is_active = swap->just_activated = false;
@@
-1109,7
+1111,7
@@
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]) {
+ LIST_FOREACH(units_
by_type, meta, m->units_by
_type[UNIT_SWAP]) {
Swap *swap = (Swap*) meta;
if (!swap->is_active) {
Swap *swap = (Swap*) meta;
if (!swap->is_active) {
@@
-1235,7
+1237,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);
@@
-1339,7
+1341,6
@@
const UnitVTable swap_vtable = {
.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,