From owner-p4-projects@FreeBSD.ORG  Wed Feb 22 02:52:36 2006
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 332FE16A424; Wed, 22 Feb 2006 02:52:34 +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 90A2516A422
	for <perforce@freebsd.org>; Wed, 22 Feb 2006 02:52:33 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6F12843D45
	for <perforce@freebsd.org>; Wed, 22 Feb 2006 02:52:33 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1M2qXpB098011
	for <perforce@freebsd.org>; Wed, 22 Feb 2006 02:52:33 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1M2qXlM098008
	for perforce@freebsd.org; Wed, 22 Feb 2006 02:52:33 GMT
	(envelope-from wsalamon@computer.org)
Date: Wed, 22 Feb 2006 02:52:33 GMT
Message-Id: <200602220252.k1M2qXlM098008@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon <wsalamon@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92172 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, 22 Feb 2006 02:52:36 -0000

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

Change 92172 by wsalamon@gretsch on 2006/02/22 02:51:36

	Bring the kern_futimes() function in agreement with the current
	FreeBSD CVS version.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#27 edit

Differences ...

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

@@ -2971,11 +2971,10 @@
 	int error;
 
 	AUDIT_ARG(fd, fd);
+	if ((error = getutimes(tptr, tptrseg, ts)) != 0)
+		return (error);
 	if ((error = getvnode(td->td_proc->p_fd, fd, &fp)) != 0)
 		return (error);
-
-	if ((error = getutimes(tptr, tptrseg, ts)) != 0)
-		return (error);
 	vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
 	error = setutimes(td, fp->f_vnode, ts, 2, tptr == NULL);
 	VFS_UNLOCK_GIANT(vfslocked);