d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge two ifs into one. Other minor style fixes.

Browse Source 
MFC after:	1 month
This commit is contained in:
Pawel Jakub Dawidek 2012-06-10 13:10:21 +00:00
parent 83ce08538a
commit 1b693d7494
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=236849
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/kern/kern_descrip.c
View File

@ -884,8 +884,7 @@ do_dup(struct thread *td, int flags, int old, int new,
fdrop(fp, td);
return (EBADF);
}
KASSERT(old != new,
("new fd is same as old"));
KASSERT(old != new, ("new fd is same as old"));
/*
* Save info on the descriptor being overwritten. We cannot close
@ -896,19 +895,17 @@ do_dup(struct thread *td, int flags, int old, int new,
*/
delfp = fdp->fd_ofiles[new];
holdleaders = 0;
if (delfp != NULL) {
if (td->td_proc->p_fdtol != NULL) {
/*
* Ask fdfree() to sleep to ensure that all relevant
* process leaders can be traversed in closef().
*/
fdp->fd_holdleaderscount++;
holdleaders = 1;
}
if (delfp != NULL && td->td_proc->p_fdtol != NULL) {
/*
* Ask fdfree() to sleep to ensure that all relevant
* process leaders can be traversed in closef().
*/
fdp->fd_holdleaderscount++;
holdleaders = 1;
}
/*
* Duplicate the source descriptor
* Duplicate the source descriptor.
*/
fdp->fd_ofiles[new] = fp;
fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE;