summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authordas <das@FreeBSD.org>2004-11-21 11:06:24 +0000
committerdas <das@FreeBSD.org>2004-11-21 11:06:24 +0000
commite764a6edec01abc86207ace169f3f4eb726a2b2c (patch)
treec01f41febf07aa76c5cf9f03ddaf602aefaa6895 /sys/kern
parent374ba89ea3f8bd9bb200591ee44b25922160b124 (diff)
downloadFreeBSD-src-e764a6edec01abc86207ace169f3f4eb726a2b2c.zip
FreeBSD-src-e764a6edec01abc86207ace169f3f4eb726a2b2c.tar.gz
Neither of the arguments to closef() can be NULL anymore, so don't
check for that.
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_descrip.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 5ee38e8..c3fdc52 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1875,8 +1875,6 @@ closef(fp, td)
struct filedesc_to_leader *fdtol;
struct filedesc *fdp;
- if (fp == NULL)
- return (0);
/*
* POSIX record locking dictates that any close releases ALL
* locks owned by this process. This is handled by setting
@@ -1885,8 +1883,7 @@ closef(fp, td)
* If the descriptor was in a message, POSIX-style locks
* aren't passed with the descriptor.
*/
- if (td != NULL &&
- fp->f_type == DTYPE_VNODE) {
+ if (fp->f_type == DTYPE_VNODE) {
if ((td->td_proc->p_leader->p_flag & P_ADVLOCK) != 0) {
lf.l_whence = SEEK_SET;
lf.l_start = 0;
OpenPOWER on IntegriCloud