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

Merge two ifs into one to make the code almost identical to the code in

Browse Source 
kern_close().

Discussed with:	kib
Tested by:	pho
MFC after:	1 month
This commit is contained in:
Pawel Jakub Dawidek 2012-06-11 19:53:41 +00:00
parent d327cee241
commit 129c87eb7d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=236912
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sys/kern/kern_descrip.c
View File

@ -892,24 +892,25 @@ do_dup(struct thread *td, int flags, int old, int new,
*
* XXX this duplicates parts of close().
*/
holdleaders = 0;
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;
}
/*
* If we dup'd over a valid file, we now own the reference to it
* and must dispose of it using closef() semantics (as if a
* close() were performed on it).
*
* XXX this duplicates parts of close().
*/
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;
} else {
holdleaders = 0;
}
/*
* If we dup'd over a valid file, we now own the reference to it
* and must dispose of it using closef() semantics (as if a
* close() were performed on it).
*
* XXX this duplicates parts of close().
*/
knote_fdclose(td, new);
/*
* When we're closing an fd with a capability, we need to