From owner-svn-src-all@FreeBSD.ORG  Wed Nov 10 23:36:13 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 A8FB3106566B;
	Wed, 10 Nov 2010 23:36:13 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 96FFB8FC18;
	Wed, 10 Nov 2010 23:36:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAANaD0K040729;
	Wed, 10 Nov 2010 23:36:13 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAANaDqo040725;
	Wed, 10 Nov 2010 23:36:13 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201011102336.oAANaDqo040725@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 10 Nov 2010 23:36:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215103 - in releng/7.1: . sys/conf sys/fs/pseudofs
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Nov 2010 23:36:13 -0000

Author: cperciva
Date: Wed Nov 10 23:36:13 2010
New Revision: 215103
URL: http://svn.freebsd.org/changeset/base/215103

Log:
  Don't unlock a mutex which wasn't locked.
  
  PR:		kern/137310
  Approved by:	so (cperciva)
  Security:	FreeBSD-SA-10:09.pseudofs

Modified:
  releng/7.1/UPDATING
  releng/7.1/sys/conf/newvers.sh
  releng/7.1/sys/fs/pseudofs/pseudofs_vnops.c

Modified: releng/7.1/UPDATING
==============================================================================
--- releng/7.1/UPDATING	Wed Nov 10 21:06:49 2010	(r215102)
+++ releng/7.1/UPDATING	Wed Nov 10 23:36:13 2010	(r215103)
@@ -8,6 +8,9 @@ Items affecting the ports and packages s
 /usr/ports/UPDATING.  Please read that file before running
 portupgrade.
 
+20101110:	p15	FreeBSD-SA-10:09.pseudofs
+	Don't unlock a mutex which wasn't locked.
+
 20100920:	p14	FreeBSD-SA-10:08.bzip2
 	Fix an integer overflow in RLE length parsing when decompressing
 	corrupt bzip2 data.

Modified: releng/7.1/sys/conf/newvers.sh
==============================================================================
--- releng/7.1/sys/conf/newvers.sh	Wed Nov 10 21:06:49 2010	(r215102)
+++ releng/7.1/sys/conf/newvers.sh	Wed Nov 10 23:36:13 2010	(r215103)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="7.1"
-BRANCH="RELEASE-p14"
+BRANCH="RELEASE-p15"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/7.1/sys/fs/pseudofs/pseudofs_vnops.c
==============================================================================
--- releng/7.1/sys/fs/pseudofs/pseudofs_vnops.c	Wed Nov 10 21:06:49 2010	(r215102)
+++ releng/7.1/sys/fs/pseudofs/pseudofs_vnops.c	Wed Nov 10 23:36:13 2010	(r215103)
@@ -305,7 +305,6 @@ pfs_getextattr(struct vop_getextattr_arg
 	if (proc != NULL)
 		PROC_UNLOCK(proc);
 
-	pfs_unlock(pn);
 	PFS_RETURN (error);
 }