CVS commit: [netbsd-5] src/sys/kern

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Wed Jul  1 22:39:20 UTC 2009

Modified Files:
        src/sys/kern [netbsd-5]: init_sysctl.c vfs_trans.c

Log Message:
Pull up following revision(s) (requested by rmind in ticket #838):
        sys/kern/init_sysctl.c: revision 1.162
        sys/kern/vfs_trans.c: revision 1.25
don't forget to skip marker processes.


To generate a diff of this commit:
cvs rdiff -u -r1.149.4.5 -r1.149.4.6 src/sys/kern/init_sysctl.c
cvs rdiff -u -r1.23 -r1.23.4.1 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.149.4.5 src/sys/kern/init_sysctl.c:1.149.4.6
--- src/sys/kern/init_sysctl.c:1.149.4.5	Wed Jul  1 22:27:23 2009
+++ src/sys/kern/init_sysctl.c	Wed Jul  1 22:39:20 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_sysctl.c,v 1.149.4.5 2009/07/01 22:27:23 snj Exp $ */
+/*	$NetBSD: init_sysctl.c,v 1.149.4.6 2009/07/01 22:39:20 snj 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.149.4.5 2009/07/01 22:27:23 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.149.4.6 2009/07/01 22:39:20 snj Exp $");
 
 #include "opt_sysv.h"
 #include "opt_compat_netbsd32.h"
@@ -1693,7 +1693,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;
@@ -2021,7 +2021,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;
@@ -2214,6 +2214,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.23 src/sys/kern/vfs_trans.c:1.23.4.1
--- src/sys/kern/vfs_trans.c:1.23	Wed Sep 17 14:49:25 2008
+++ src/sys/kern/vfs_trans.c	Wed Jul  1 22:39:20 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_trans.c,v 1.23 2008/09/17 14:49:25 hannken Exp $	*/
+/*	$NetBSD: vfs_trans.c,v 1.23.4.1 2009/07/01 22:39:20 snj 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.23 2008/09/17 14:49:25 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_trans.c,v 1.23.4.1 2009/07/01 22:39:20 snj Exp $");
 
 /*
  * File system transaction operations.
@@ -486,7 +486,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);