chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9993ef2
)
swap: properly specify errno when logging
author
Lennart Poettering
<lennart@poettering.net>
Tue, 27 Jan 2015 23:04:47 +0000
(
00:04
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 27 Jan 2015 23:04:47 +0000
(
00:04
+0100)
src/core/swap.c
patch
|
blob
|
history
diff --git
a/src/core/swap.c
b/src/core/swap.c
index b2ebed4b72c182d08b1a5f4ebcc58c25c50b65cd..cc03b14e7688cac83f61bce5f4898ddabc455041 100644
(file)
--- a/
src/core/swap.c
+++ b/
src/core/swap.c
@@
-637,7
+637,6
@@
static int swap_spawn(Swap *s, ExecCommand *c, pid_t *_pid) {
fail:
s->timer_event_source = sd_event_source_unref(s->timer_event_source);
fail:
s->timer_event_source = sd_event_source_unref(s->timer_event_source);
-
return r;
}
return r;
}
@@
-699,9
+698,7
@@
static void swap_enter_signal(Swap *s, SwapState state, SwapResult f) {
return;
fail:
return;
fail:
- log_unit_warning(UNIT(s)->id,
- "%s failed to kill processes: %s", UNIT(s)->id, strerror(-r));
-
+ log_unit_warning_errno(UNIT(s)->id, r, "%s failed to kill processes: %m", UNIT(s)->id);
swap_enter_dead(s, SWAP_FAILURE_RESOURCES);
}
swap_enter_dead(s, SWAP_FAILURE_RESOURCES);
}
@@
-764,9
+761,7
@@
static void swap_enter_activating(Swap *s) {
return;
fail:
return;
fail:
- log_unit_warning(UNIT(s)->id,
- "%s failed to run 'swapon' task: %s",
- UNIT(s)->id, strerror(-r));
+ log_unit_warning_errno(UNIT(s)->id, r, "%s failed to run 'swapon' task: %m", UNIT(s)->id);
swap_enter_dead(s, SWAP_FAILURE_RESOURCES);
}
swap_enter_dead(s, SWAP_FAILURE_RESOURCES);
}
@@
-796,9
+791,7
@@
static void swap_enter_deactivating(Swap *s) {
return;
fail:
return;
fail:
- log_unit_warning(UNIT(s)->id,
- "%s failed to run 'swapoff' task: %s",
- UNIT(s)->id, strerror(-r));
+ log_unit_warning_errno(UNIT(s)->id, r, "%s failed to run 'swapoff' task: %m", UNIT(s)->id);
swap_enter_active(s, SWAP_FAILURE_RESOURCES);
}
swap_enter_active(s, SWAP_FAILURE_RESOURCES);
}