svn commit: r237158 - head/sys/kern

[Pawel Jakub Dawidek]

Author: pjd
Date: Sat Jun 16 12:56:36 2012
New Revision: 237158
URL: http://svn.freebsd.org/changeset/base/237158

Log:
  Revert r237073. 'td' can be NULL here.
  
  MFC after:	1 month

Modified:
  head/sys/kern/kern_descrip.c

Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c	Sat Jun 16 09:17:21 2012	(r237157)
+++ head/sys/kern/kern_descrip.c	Sat Jun 16 12:56:36 2012	(r237158)
@@ -2104,9 +2104,6 @@ closef(struct file *fp, struct thread *t
 	struct filedesc *fdp;
 	struct file *fp_object;
 
-	fdp = td->td_proc->p_fd;
-	FILEDESC_UNLOCK_ASSERT(fdp);
-
 	/*
 	 * POSIX record locking dictates that any close releases ALL
 	 * locks owned by this process.  This is handled by setting
@@ -2142,6 +2139,7 @@ closef(struct file *fp, struct thread *t
 			 * Handle special case where file descriptor table is
 			 * shared between multiple process leaders.
 			 */
+			fdp = td->td_proc->p_fd;
 			FILEDESC_XLOCK(fdp);
 			for (fdtol = fdtol->fdl_next;
 			     fdtol != td->td_proc->p_fdtol;