morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

pid1: rewrite check in ignore_proc() to not check condition twice

Browse Source 
It's harmless, but it seems nicer to evaluate a condition just a single time.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-01-28 21:09:08 -05:00
parent 7db5706eec
commit 9e615117da
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/killall.c
View File

@@ -66,29 +66,26 @@ static bool ignore_proc(pid_t pid, bool warn_rootfs) {
if (count <= 0)
return true;
/* Processes with argv[0][0] = '@' we ignore from the killing
* spree.
/* Processes with argv[0][0] = '@' we ignore from the killing spree.
*
* http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons */
if (c == '@' && warn_rootfs) {
_cleanup_free_ char *comm = NULL;
if (c != '@')
return false;
r = pid_from_same_root_fs(pid);
if (r < 0)
return true;
if (warn_rootfs &&
pid_from_same_root_fs(pid) == 0) {
_cleanup_free_ char *comm = NULL;
get_process_comm(pid, &comm);
if (r)
log_notice("Process " PID_FMT " (%s) has been marked to be excluded from killing. It is "
"running from the root file system, and thus likely to block re-mounting of the "
"root file system to read-only. Please consider moving it into an initrd file "
"system instead.", pid, strna(comm));
return true;
} else if (c == '@')
return true;
log_notice("Process " PID_FMT " (%s) has been marked to be excluded from killing. It is "
"running from the root file system, and thus likely to block re-mounting of the "
"root file system to read-only. Please consider moving it into an initrd file "
"system instead.", pid, strna(comm));
}
return false;
return true;
}
static void wait_for_children(Set *pids, sigset_t *mask) {