From owner-p4-projects@FreeBSD.ORG  Fri Nov 27 20:39:47 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 65A101065672; Fri, 27 Nov 2009 20:39:47 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29A8C106566B
	for <perforce@FreeBSD.org>; Fri, 27 Nov 2009 20:39:47 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 16FF68FC0C
	for <perforce@FreeBSD.org>; Fri, 27 Nov 2009 20:39:47 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nARKdkh4015556
	for <perforce@FreeBSD.org>; Fri, 27 Nov 2009 20:39:46 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nARKdkSV015554
	for perforce@freebsd.org; Fri, 27 Nov 2009 20:39:46 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Fri, 27 Nov 2009 20:39:46 GMT
Message-Id: <200911272039.nARKdkSV015554@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi <truncs@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 171107 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 27 Nov 2009 20:39:47 -0000

http://p4web.freebsd.org/chv.cgi?CH=171107

Change 171107 by truncs@aditya on 2009/11/27 20:39:35

	Call the correct itimes function when it is already under a lock.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vnops.c#5 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_vnops.c#5 (text+ko) ====

@@ -82,6 +82,7 @@
 #include <fs/ext2fs/ext2_dir.h>
 
 static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *);
+static void ext2_itimes_locked(struct vnode *);
 
 static vop_access_t	ext2_access;
 static int ext2_chmod(struct vnode *, int, struct ucred *, struct thread *);
@@ -285,7 +286,7 @@
 
 	VI_LOCK(vp);
 	if (vp->v_usecount > 1)
-		ext2_itimes(vp);
+		ext2_itimes_locked(vp);
 	VI_UNLOCK(vp);
 	return (0);
 }
@@ -1477,7 +1478,7 @@
 
 	VI_LOCK(vp);
 	if (vp->v_usecount > 1)
-		ext2_itimes(vp);
+		ext2_itimes_locked(vp);
 	VI_UNLOCK(vp);
 	return (fifo_specops.vop_close(ap));
 }