summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_descrip.c
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2012-06-10 06:31:54 +0000
committerpjd <pjd@FreeBSD.org>2012-06-10 06:31:54 +0000
commit67f6f356fc8b6f3b8ea8a77976d91073ab2f1f65 (patch)
treec21e00fbd57b459a4ccff00e067d430aa1000a48 /sys/kern/kern_descrip.c
parentefecd13fd03d30a5c13228ca80178cfec8d65996 (diff)
downloadFreeBSD-src-67f6f356fc8b6f3b8ea8a77976d91073ab2f1f65.zip
FreeBSD-src-67f6f356fc8b6f3b8ea8a77976d91073ab2f1f65.tar.gz
Simplify fdtofp().
MFC after: 1 month
Diffstat (limited to 'sys/kern/kern_descrip.c')
-rw-r--r--sys/kern/kern_descrip.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 3a5b318..2dc743b 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -430,13 +430,13 @@ sys_fcntl(struct thread *td, struct fcntl_args *uap)
static inline struct file *
fdtofp(int fd, struct filedesc *fdp)
{
- struct file *fp;
FILEDESC_LOCK_ASSERT(fdp);
- if ((unsigned)fd >= fdp->fd_nfiles ||
- (fp = fdp->fd_ofiles[fd]) == NULL)
+
+ if ((unsigned)fd >= fdp->fd_nfiles)
return (NULL);
- return (fp);
+
+ return (fdp->fd_ofiles[fd]);
}
static inline int
OpenPOWER on IntegriCloud