From owner-svn-src-head@FreeBSD.ORG  Tue Dec  2 11:12:51 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 483A51065672;
	Tue,  2 Dec 2008 11:12:51 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 38F5E8FC14;
	Tue,  2 Dec 2008 11:12:51 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mB2BCpl2058556;
	Tue, 2 Dec 2008 11:12:51 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB2BCpWH058555;
	Tue, 2 Dec 2008 11:12:51 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200812021112.mB2BCpWH058555@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 2 Dec 2008 11:12:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185556 - head/sys/ufs/ufs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Dec 2008 11:12:51 -0000

Author: kib
Date: Tue Dec  2 11:12:50 2008
New Revision: 185556
URL: http://svn.freebsd.org/changeset/base/185556

Log:
  Do not lock vnode interlock around reading of v_iflag to check VI_DOOMED.
  Read of the pointer is atomic, and flag cannot be set while vnode lock
  is held.
  
  Requested by:	jhb
  MFC after:	1 month

Modified:
  head/sys/ufs/ufs/ufs_lookup.c

Modified: head/sys/ufs/ufs/ufs_lookup.c
==============================================================================
--- head/sys/ufs/ufs/ufs_lookup.c	Tue Dec  2 10:46:35 2008	(r185555)
+++ head/sys/ufs/ufs/ufs_lookup.c	Tue Dec  2 11:12:50 2008	(r185556)
@@ -157,7 +157,6 @@ ufs_lookup(ap)
 	int nameiop = cnp->cn_nameiop;
 	ino_t ino;
 	int ltype;
-	int pdoomed;
 	struct mount *mp;
 
 	bp = NULL;
@@ -588,20 +587,14 @@ found:
 			VOP_UNLOCK(pdp, 0);
 			pause("ufs_dd", 1);
 			vn_lock(pdp, ltype | LK_RETRY);
-			VI_LOCK(pdp);
-			pdoomed = pdp->v_iflag & VI_DOOMED;
-			VI_UNLOCK(pdp);
-			if (pdoomed)
+			if (pdp->v_iflag & VI_DOOMED)
 				return (ENOENT);
 		}
 		VOP_UNLOCK(pdp, 0);	/* race to get the inode */
 		error = VFS_VGET(mp, ino, cnp->cn_lkflags, &tdp);
 		vfs_unbusy(mp);
 		vn_lock(pdp, ltype | LK_RETRY);
-		VI_LOCK(pdp);
-		pdoomed = pdp->v_iflag & VI_DOOMED;
-		VI_UNLOCK(pdp);
-		if (pdoomed) {
+		if (pdp->v_iflag & VI_DOOMED) {
 			if (error == 0)
 				vput(tdp);
 			error = ENOENT;