diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/newvers.sh | 2 | ||||
| -rw-r--r-- | sys/kern/kern_descrip.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 3bd6a43fed63..b0890ecb98e4 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -36,7 +36,7 @@ TYPE="FreeBSD" REVISION="4.6.2" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index c2db5a4cffe9..50888ce6820a 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -711,10 +711,12 @@ fpathconf(p, uap) switch (fp->f_type) { case DTYPE_PIPE: case DTYPE_SOCKET: - if (uap->name != _PC_PIPE_BUF) - return (EINVAL); - p->p_retval[0] = PIPE_BUF; - error = 0; + if (uap->name != _PC_PIPE_BUF) { + error = EINVAL; + } else { + p->p_retval[0] = PIPE_BUF; + error = 0; + } break; case DTYPE_FIFO: case DTYPE_VNODE: |