Module Name: src
Committed By: yamt
Date: Wed Mar 3 00:47:31 UTC 2010
Modified Files:
src/sys/kern: kern_exit.c kern_ktrace.c kern_resource.c kern_runq.c
kern_sig.c kern_synch.c vfs_syscalls.c
Log Message:
remove redundant checks of PK_MARKER.
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/kern/kern_exit.c
cvs rdiff -u -r1.150 -r1.151 src/sys/kern/kern_ktrace.c
cvs rdiff -u -r1.154 -r1.155 src/sys/kern/kern_resource.c
cvs rdiff -u -r1.29 -r1.30 src/sys/kern/kern_runq.c
cvs rdiff -u -r1.303 -r1.304 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.279 -r1.280 src/sys/kern/kern_synch.c
cvs rdiff -u -r1.403 -r1.404 src/sys/kern/vfs_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_exit.c
diff -u src/sys/kern/kern_exit.c:1.226 src/sys/kern/kern_exit.c:1.227
--- src/sys/kern/kern_exit.c:1.226 Mon Mar 1 21:10:15 2010
+++ src/sys/kern/kern_exit.c Wed Mar 3 00:47:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exit.c,v 1.226 2010/03/01 21:10:15 darran Exp $ */
+/* $NetBSD: kern_exit.c,v 1.227 2010/03/03 00:47:30 yamt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.226 2010/03/01 21:10:15 darran Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.227 2010/03/03 00:47:30 yamt Exp $");
#include "opt_ktrace.h"
#include "opt_perfctrs.h"
@@ -436,8 +436,6 @@
*/
if (__predict_false(p->p_slflag & PSL_CHTRACED)) {
PROCLIST_FOREACH(q, &allproc) {
- if ((q->p_flag & PK_MARKER) != 0)
- continue;
if (q->p_opptr == p)
q->p_opptr = NULL;
}
Index: src/sys/kern/kern_ktrace.c
diff -u src/sys/kern/kern_ktrace.c:1.150 src/sys/kern/kern_ktrace.c:1.151
--- src/sys/kern/kern_ktrace.c:1.150 Fri Oct 2 21:47:35 2009
+++ src/sys/kern/kern_ktrace.c Wed Mar 3 00:47:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ktrace.c,v 1.150 2009/10/02 21:47:35 elad Exp $ */
+/* $NetBSD: kern_ktrace.c,v 1.151 2010/03/03 00:47:30 yamt Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.150 2009/10/02 21:47:35 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.151 2010/03/03 00:47:30 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -499,7 +499,7 @@
mutex_enter(proc_lock);
PROCLIST_FOREACH(p, &allproc) {
- if ((p->p_flag & PK_MARKER) != 0 || p->p_tracep != ktd)
+ if (p->p_tracep != ktd)
continue;
mutex_enter(p->p_lock);
mutex_enter(&ktrace_lock);
Index: src/sys/kern/kern_resource.c
diff -u src/sys/kern/kern_resource.c:1.154 src/sys/kern/kern_resource.c:1.155
--- src/sys/kern/kern_resource.c:1.154 Fri Oct 2 22:46:18 2009
+++ src/sys/kern/kern_resource.c Wed Mar 3 00:47:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_resource.c,v 1.154 2009/10/02 22:46:18 elad Exp $ */
+/* $NetBSD: kern_resource.c,v 1.155 2010/03/03 00:47:30 yamt Exp $ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.154 2009/10/02 22:46:18 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.155 2010/03/03 00:47:30 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -192,8 +192,6 @@
if (who == 0)
who = (int)kauth_cred_geteuid(l->l_cred);
PROCLIST_FOREACH(p, &allproc) {
- if ((p->p_flag & PK_MARKER) != 0)
- continue;
mutex_enter(p->p_lock);
if (kauth_cred_geteuid(p->p_cred) ==
(uid_t)who && p->p_nice < low)
@@ -263,8 +261,6 @@
if (who == 0)
who = (int)kauth_cred_geteuid(l->l_cred);
PROCLIST_FOREACH(p, &allproc) {
- if ((p->p_flag & PK_MARKER) != 0)
- continue;
mutex_enter(p->p_lock);
if (kauth_cred_geteuid(p->p_cred) ==
(uid_t)SCARG(uap, who)) {
Index: src/sys/kern/kern_runq.c
diff -u src/sys/kern/kern_runq.c:1.29 src/sys/kern/kern_runq.c:1.30
--- src/sys/kern/kern_runq.c:1.29 Wed Jan 13 01:57:17 2010
+++ src/sys/kern/kern_runq.c Wed Mar 3 00:47:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_runq.c,v 1.29 2010/01/13 01:57:17 mrg Exp $ */
+/* $NetBSD: kern_runq.c,v 1.30 2010/03/03 00:47:30 yamt Exp $ */
/*
* Copyright (c) 2007, 2008 Mindaugas Rasiukevicius <rmind at NetBSD org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_runq.c,v 1.29 2010/01/13 01:57:17 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_runq.c,v 1.30 2010/03/03 00:47:30 yamt Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -892,8 +892,6 @@
"LID", "PRI", "EPRI", "FL", "ST", "LWP", "CPU", "TCI", "LRTICKS");
PROCLIST_FOREACH(p, &allproc) {
- if ((p->p_flag & PK_MARKER) != 0)
- continue;
(*pr)(" /- %d (%s)\n", (int)p->p_pid, p->p_comm);
LIST_FOREACH(l, &p->p_lwps, l_sibling) {
ci = l->l_cpu;
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.303 src/sys/kern/kern_sig.c:1.304
--- src/sys/kern/kern_sig.c:1.303 Mon Mar 1 21:10:17 2010
+++ src/sys/kern/kern_sig.c Wed Mar 3 00:47:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.303 2010/03/01 21:10:17 darran Exp $ */
+/* $NetBSD: kern_sig.c,v 1.304 2010/03/03 00:47:31 yamt Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.303 2010/03/01 21:10:17 darran Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.304 2010/03/03 00:47:31 yamt Exp $");
#include "opt_ptrace.h"
#include "opt_compat_sunos.h"
@@ -862,7 +862,7 @@
*/
PROCLIST_FOREACH(p, &allproc) {
if (p->p_pid <= 1 || p == cp ||
- p->p_flag & (PK_SYSTEM|PK_MARKER))
+ (p->p_flag & PK_SYSTEM) != 0)
continue;
mutex_enter(p->p_lock);
if (kauth_authorize_process(pc,
@@ -2283,8 +2283,6 @@
mutex_enter(proc_lock);
PROCLIST_FOREACH(p, &allproc) {
- if ((p->p_flag & PK_MARKER) != 0)
- continue;
mutex_enter(p->p_lock);
if ((p->p_sflag & PS_STOPPING) == 0) {
Index: src/sys/kern/kern_synch.c
diff -u src/sys/kern/kern_synch.c:1.279 src/sys/kern/kern_synch.c:1.280
--- src/sys/kern/kern_synch.c:1.279 Tue Feb 23 22:19:27 2010
+++ src/sys/kern/kern_synch.c Wed Mar 3 00:47:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.279 2010/02/23 22:19:27 darran Exp $ */
+/* $NetBSD: kern_synch.c,v 1.280 2010/03/03 00:47:31 yamt Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.279 2010/02/23 22:19:27 darran Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.280 2010/03/03 00:47:31 yamt Exp $");
#include "opt_kstack.h"
#include "opt_perfctrs.h"
@@ -1033,9 +1033,6 @@
*/
mutex_enter(proc_lock);
PROCLIST_FOREACH(p, &allproc) {
- if ((p->p_flag & PK_MARKER) != 0)
- continue;
-
mutex_enter(p->p_lock);
if ((p->p_flag & PK_SYSTEM) != 0) {
mutex_exit(p->p_lock);
@@ -1177,9 +1174,6 @@
mutex_enter(proc_lock);
PROCLIST_FOREACH(p, &allproc) {
- if (__predict_false((p->p_flag & PK_MARKER) != 0))
- continue;
-
/* Increment sleep time (if sleeping), ignore overflow. */
mutex_enter(p->p_lock);
runtm = p->p_rtime.sec;
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.403 src/sys/kern/vfs_syscalls.c:1.404
--- src/sys/kern/vfs_syscalls.c:1.403 Fri Jan 15 01:00:46 2010
+++ src/sys/kern/vfs_syscalls.c Wed Mar 3 00:47:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.403 2010/01/15 01:00:46 pooka Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.404 2010/03/03 00:47:31 yamt Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.403 2010/01/15 01:00:46 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.404 2010/03/03 00:47:31 yamt Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -578,8 +578,6 @@
retry = false;
mutex_enter(proc_lock);
PROCLIST_FOREACH(p, &allproc) {
- if ((p->p_flag & PK_MARKER) != 0)
- continue;
if ((cwdi = p->p_cwdi) == NULL)
continue;
/*
