From 1d29258ac26aa94624a7040facf87f3e9049f308 Mon Sep 17 00:00:00 2001
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Mon, 3 Nov 2014 05:12:17 +0000
Subject: [PATCH] filedesc: plug unnecessary fdp NULL checks in fdescfreee and
 fdcopy

Anything reaching these functions has fd table.
---
 sys/kern/kern_descrip.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 2d1a5af27fa2..861a26ce44c3 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/unistd.h>
 #include <sys/user.h>
 #include <sys/vnode.h>
+#include <sys/kdb.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
@@ -1910,9 +1911,7 @@ fdcopy(struct filedesc *fdp)
 	struct filedescent *nfde, *ofde;
 	int i;
 
-	/* Certain daemons might not have file descriptors. */
-	if (fdp == NULL)
-		return (NULL);
+	MPASS(fdp != NULL);
 
 	newfdp = fdinit(fdp);
 	/* copy all passable descriptors (i.e. not kqueue) */
@@ -2034,10 +2033,8 @@ fdescfree(struct thread *td)
 	struct vnode *cdir, *jdir, *rdir;
 	int i;
 
-	/* Certain daemons might not have file descriptors. */
 	fdp = td->td_proc->p_fd;
-	if (fdp == NULL)
-		return;
+	MPASS(fdp != NULL);
 
 #ifdef RACCT
 	PROC_LOCK(td->td_proc);