diff options
| author | pjd <pjd@FreeBSD.org> | 2012-06-16 12:56:36 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2012-06-16 12:56:36 +0000 |
| commit | 9719a38d39bd5b70947eca50816a9719adeda5c6 (patch) | |
| tree | ee7037bdca9db6bf13b7786648764db858fe7733 /sys/kern/kern_descrip.c | |
| parent | 0fde8515066f73952901780ba0b12fe7d118185f (diff) | |
| download | FreeBSD-src-9719a38d39bd5b70947eca50816a9719adeda5c6.zip FreeBSD-src-9719a38d39bd5b70947eca50816a9719adeda5c6.tar.gz | |
Revert r237073. 'td' can be NULL here.
MFC after: 1 month
Diffstat (limited to 'sys/kern/kern_descrip.c')
| -rw-r--r-- | sys/kern/kern_descrip.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index fea1eb7..f5106e1 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2104,9 +2104,6 @@ closef(struct file *fp, struct thread *td) 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 *td) * 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; |
