diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2010-11-10 23:36:13 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2010-11-10 23:36:13 +0000 |
| commit | 9738e0c840babe80b46f34c17bcd8adbff6aea70 (patch) | |
| tree | 8dad2094f5b5174c870ff2732c296c89d1558318 | |
| parent | 7814303c3f99a4475fb87a9194e205537c8eca6f (diff) | |
Notes
| -rw-r--r-- | UPDATING | 3 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/fs/pseudofs/pseudofs_vnops.c | 1 |
3 files changed, 4 insertions, 2 deletions
@@ -8,6 +8,9 @@ Items affecting the ports and packages system can be found in /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. diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 833a9c08ea0e..da9a0ff3910e 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -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 diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index 354b01ad7baa..faa36b5128b2 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -305,7 +305,6 @@ pfs_getextattr(struct vop_getextattr_args *va) if (proc != NULL) PROC_UNLOCK(proc); - pfs_unlock(pn); PFS_RETURN (error); } |