From owner-svn-src-all@FreeBSD.ORG Wed Jun 10 16:17:38 2009 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 DAC48106564A; Wed, 10 Jun 2009 16:17:38 +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 C933C8FC1C; Wed, 10 Jun 2009 16:17:38 +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 n5AGHcd1019031; Wed, 10 Jun 2009 16:17:38 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AGHc2N019030; Wed, 10 Jun 2009 16:17:38 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <200906101617.n5AGHc2N019030@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 10 Jun 2009 16:17:38 +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: r193931 - head/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: Wed, 10 Jun 2009 16:17:39 -0000 Author: kib Date: Wed Jun 10 16:17:38 2009 New Revision: 193931 URL: http://svn.freebsd.org/changeset/base/193931 Log: Do not leak the state->ls_lock after VI_DOOMED check introduced in the r192683. Reported by: pho Submitted by: jhb Modified: head/sys/kern/kern_lockf.c Modified: head/sys/kern/kern_lockf.c ============================================================================== --- head/sys/kern/kern_lockf.c Wed Jun 10 15:48:34 2009 (r193930) +++ head/sys/kern/kern_lockf.c Wed Jun 10 16:17:38 2009 (r193931) @@ -647,6 +647,7 @@ lf_advlockasync(struct vop_advlockasync_ VI_LOCK(vp); if (vp->v_iflag & VI_DOOMED) { VI_UNLOCK(vp); + sx_xunlock(&state->ls_lock); lf_free_lock(lock); return (ENOENT); }