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

Use more intuitive pointer for fdinit() and fdcopy().

Browse Source 
Change fdcopy() to take unlocked filedesc.
This commit is contained in:
Poul-Henning Kamp 2004-11-08 12:43:23 +00:00
parent 56dd3a6182
commit 598b7ec86b
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/kern/kern_descrip.c
View File

@ -1494,8 +1494,6 @@ fdcopy(fdp)
if (fdp == NULL)
return (NULL);
FILEDESC_LOCK_ASSERT(fdp, MA_OWNED);
FILEDESC_UNLOCK(fdp);
newfdp = fdinit(fdp);
FILEDESC_LOCK(fdp);
while (fdp->fd_lastfile >= newfdp->fd_nfiles) {
@ -1529,6 +1527,7 @@ fdcopy(fdp)
if (newfdp->fd_freefile == -1)
newfdp->fd_freefile = i;
newfdp->fd_cmask = fdp->fd_cmask;
FILEDESC_UNLOCK(fdp);
return (newfdp);
}

2
sys/kern/kern_exec.c
View File

@ -469,8 +469,8 @@ interpret:
if (p->p_fd->fd_refcnt > 1) {
struct filedesc *tmp;
tmp = fdcopy(td->td_proc->p_fd);
FILEDESC_UNLOCK(p->p_fd);
tmp = fdcopy(p->p_fd);
fdfree(td);
p->p_fd = tmp;
} else

8
sys/kern/kern_fork.c
View File

@ -238,8 +238,8 @@ fork1(td, flags, pages, procp)
if (p1->p_fd->fd_refcnt > 1) {
struct filedesc *newfd;
newfd = fdcopy(td->td_proc->p_fd);
FILEDESC_UNLOCK(p1->p_fd);
newfd = fdcopy(p1->p_fd);
fdfree(td);
p1->p_fd = newfd;
} else
@ -421,12 +421,10 @@ again:
* Copy filedesc.
*/
if (flags & RFCFDG) {
fd = fdinit(td->td_proc->p_fd);
fd = fdinit(p1->p_fd);
fdtol = NULL;
} else if (flags & RFFDG) {
FILEDESC_LOCK(p1->p_fd);
fd = fdcopy(td->td_proc->p_fd);
FILEDESC_UNLOCK(p1->p_fd);
fd = fdcopy(p1->p_fd);
fdtol = NULL;
} else {
fd = fdshare(p1->p_fd);