From owner-svn-src-all@FreeBSD.ORG Sat Oct 25 14:00:38 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C817106566B; Sat, 25 Oct 2008 14:00:38 +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 5A8048FC1A; Sat, 25 Oct 2008 14:00:38 +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 m9PE0cwp033956; Sat, 25 Oct 2008 14:00:38 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9PE0c3B033955; Sat, 25 Oct 2008 14:00:38 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200810251400.m9PE0c3B033955@svn.freebsd.org> From: Doug Rabson Date: Sat, 25 Oct 2008 14:00:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184260 - in stable/7/sys: . kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Oct 2008 14:00:38 -0000 Author: dfr Date: Sat Oct 25 14:00:37 2008 New Revision: 184260 URL: http://svn.freebsd.org/changeset/base/184260 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/7/sys/ (props changed) stable/7/sys/kern/kern_lockf.c Modified: stable/7/sys/kern/kern_lockf.c ============================================================================== --- stable/7/sys/kern/kern_lockf.c Sat Oct 25 11:37:42 2008 (r184259) +++ stable/7/sys/kern/kern_lockf.c Sat Oct 25 14:00:37 2008 (r184260) @@ -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