From owner-p4-projects@FreeBSD.ORG  Wed Sep 21 15:46:02 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7040716A421; Wed, 21 Sep 2005 15:46:02 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 49A1016A41F
	for <perforce@freebsd.org>; Wed, 21 Sep 2005 15:46:02 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1071343D46
	for <perforce@freebsd.org>; Wed, 21 Sep 2005 15:46:02 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8LFk1BY087856
	for <perforce@freebsd.org>; Wed, 21 Sep 2005 15:46:01 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8LFk1fW087853
	for perforce@freebsd.org; Wed, 21 Sep 2005 15:46:01 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 21 Sep 2005 15:46:01 GMT
Message-Id: <200509211546.j8LFk1fW087853@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 84061 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Sep 2005 15:46:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=84061

Change 84061 by rwatson@rwatson_zoo on 2005/09/21 15:45:51

	Spot integrate of accounting bug fix from TrustedBSD base into
	TrustedBSD audit, as this bug fix is required to pass the audit3
	regression test suite.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#4 integrate

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/kern/kern_acct.c#4 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.74 2005/03/01 08:56:13 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.75 2005/09/21 15:28:07 rwatson Exp $");
 
 #include "opt_mac.h"
 
@@ -400,7 +400,7 @@
 			mtx_unlock(&acct_mtx);
 			return;
 		}
-		(void)VFS_STATFS(savacctp->v_mount, &sb, (struct thread *)0);
+		(void)VFS_STATFS(savacctp->v_mount, &sb, curthread);
 		if (sb.f_bavail > acctresume * sb.f_blocks / 100) {
 			acctp = savacctp;
 			acctcred = savacctcred;
@@ -422,7 +422,7 @@
 			mtx_unlock(&acct_mtx);
 			return;
 		}
-		(void)VFS_STATFS(acctp->v_mount, &sb, (struct thread *)0);
+		(void)VFS_STATFS(acctp->v_mount, &sb, curthread);
 		if (sb.f_bavail <= acctsuspend * sb.f_blocks / 100) {
 			savacctp = acctp;
 			savacctflags = acctflags;