svn commit: r215103 - in releng/7.1: . sys/conf sys/fs/pseudofs

[Colin Percival]

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);
 }