From owner-svn-src-stable-6@FreeBSD.ORG  Sat Oct 25 14:01:08 2008
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BCD8E10656A5;
	Sat, 25 Oct 2008 14:01:08 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AAC798FC17;
	Sat, 25 Oct 2008 14:01:08 +0000 (UTC) (envelope-from dfr@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 m9PE183G034003;
	Sat, 25 Oct 2008 14:01:08 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9PE18qX034002;
	Sat, 25 Oct 2008 14:01:08 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200810251401.m9PE18qX034002@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Sat, 25 Oct 2008 14:01:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184261 - in stable/6/sys: . kern
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Oct 2008 14:01:08 -0000

Author: dfr
Date: Sat Oct 25 14:01:08 2008
New Revision: 184261
URL: http://svn.freebsd.org/changeset/base/184261

Log:
  MFC: r184227 - don't use *statep without holding the vnode interlock
  
  This change is being merged earlier than originally planned at the request
  of the release engineers.
  
  Approved by:    re (kib)

Modified:
  stable/6/sys/   (props changed)
  stable/6/sys/kern/kern_lockf.c

Modified: stable/6/sys/kern/kern_lockf.c
==============================================================================
--- stable/6/sys/kern/kern_lockf.c	Sat Oct 25 14:00:37 2008	(r184260)
+++ stable/6/sys/kern/kern_lockf.c	Sat Oct 25 14:01:08 2008	(r184261)
@@ -467,12 +467,15 @@ lf_advlockasync(struct vop_advlockasync_
 	/*
 	 * Avoid the common case of unlocking when inode has no locks.
 	 */
-	if ((*statep) == NULL || LIST_EMPTY(&(*statep)->ls_active)) {
+	VI_LOCK(vp);
+	if ((*statep) == NULL) {
 		if (ap->a_op != F_SETLK) {
 			fl->l_type = F_UNLCK;
+			VI_UNLOCK(vp);
 			return (0);
 		}
 	}
+	VI_UNLOCK(vp);
 
 	/*
 	 * Map our arguments to an existing lock owner or create one