Module Name: src
Committed By: yamt
Date: Tue May 12 11:42:13 UTC 2009
Modified Files:
src/sys/kern: init_sysctl.c vfs_trans.c
Log Message:
don't forget to skip marker processes.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/kern/init_sysctl.c
cvs rdiff -u -r1.24 -r1.25 src/sys/kern/vfs_trans.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/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.161 src/sys/kern/init_sysctl.c:1.162
--- src/sys/kern/init_sysctl.c:1.161 Mon May 4 14:52:33 2009
+++ src/sys/kern/init_sysctl.c Tue May 12 11:42:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.161 2009/05/04 14:52:33 yamt Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.162 2009/05/12 11:42:12 yamt Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.161 2009/05/04 14:52:33 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.162 2009/05/12 11:42:12 yamt Exp $");
#include "opt_sysv.h"
#include "opt_compat_netbsd32.h"
@@ -1727,7 +1727,7 @@
sysctl_unlock();
if (pid == -1) {
mutex_enter(proc_lock);
- LIST_FOREACH(p, &allproc, p_list) {
+ PROCLIST_FOREACH(p, &allproc) {
/* Grab a hold on the process. */
if (!rw_tryenter(&p->p_reflock, RW_READER)) {
continue;
@@ -2053,7 +2053,7 @@
return (EINVAL);
sysctl_unlock();
mutex_enter(proc_lock);
- LIST_FOREACH(p, &allproc, p_list) {
+ PROCLIST_FOREACH(p, &allproc) {
if (p->p_stat == SIDL) {
/* skip embryonic processes */
continue;
@@ -2244,6 +2244,8 @@
break;
}
next = LIST_NEXT(p, p_list);
+ if ((p->p_flag & PK_MARKER) != 0)
+ continue;
/*
* Skip embryonic processes.
Index: src/sys/kern/vfs_trans.c
diff -u src/sys/kern/vfs_trans.c:1.24 src/sys/kern/vfs_trans.c:1.25
--- src/sys/kern/vfs_trans.c:1.24 Sun Nov 16 19:34:29 2008
+++ src/sys/kern/vfs_trans.c Tue May 12 11:42:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_trans.c,v 1.24 2008/11/16 19:34:29 pooka Exp $ */
+/* $NetBSD: vfs_trans.c,v 1.25 2009/05/12 11:42:12 yamt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_trans.c,v 1.24 2008/11/16 19:34:29 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_trans.c,v 1.25 2009/05/12 11:42:12 yamt Exp $");
/*
* File system transaction operations.
@@ -487,7 +487,7 @@
printf("Fstrans locks by lwp:\n");
for (pd = proclists; pd->pd_list != NULL; pd++)
- LIST_FOREACH(p, pd->pd_list, p_list)
+ PROCLIST_FOREACH(p, pd->pd_list)
LIST_FOREACH(l, &p->p_lwps, l_sibling)
fstrans_print_lwp(p, l, full == 1);
