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

Make fdunshare accept only td parameter.

Browse Source 
Proc had to match the thread anyway and 2 parameters were inconsistent
with the rest.

MFC after:	1 week
This commit is contained in:
mjg 2014-06-28 05:41:53 +00:00
parent 16033c0793
commit 0954f0fb37
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/kern/kern_descrip.c
View File

@ -1850,9 +1850,10 @@ fdshare(struct filedesc *fdp)
* Unshare a filedesc structure, if necessary by making a copy
*/
void
fdunshare(struct proc *p, struct thread *td)
fdunshare(struct thread *td)
{
struct filedesc *tmp;
struct proc *p = td->td_proc;
if (p->p_fd->fd_refcnt == 1)
return;

2
sys/kern/kern_exec.c
View File

@ -594,7 +594,7 @@ interpret:
* For security and other reasons, the file descriptor table cannot
* be shared after an exec.
*/
fdunshare(p, td);
fdunshare(td);
/*
* Malloc things before we need locks.

4
sys/kern/kern_fork.c
View File

@ -341,8 +341,8 @@ fork_norfproc(struct thread *td, int flags)
/*
* Unshare file descriptors (from parent).
*/
if (flags & RFFDG)
fdunshare(p1, td);
if (flags & RFFDG)
fdunshare(td);
fail:
if (((p1->p_flag & (P_HADTHREADS|P_SYSTEM)) == P_HADTHREADS) &&

2
sys/sys/filedesc.h
View File

@ -152,7 +152,7 @@ int fdcheckstd(struct thread *td);
void fdclose(struct filedesc *fdp, struct file *fp, int idx, struct thread *td);
void fdcloseexec(struct thread *td);
struct filedesc *fdcopy(struct filedesc *fdp);
void fdunshare(struct proc *p, struct thread *td);
void fdunshare(struct thread *td);
void fdescfree(struct thread *td);
struct filedesc *fdinit(struct filedesc *fdp);
struct filedesc *fdshare(struct filedesc *fdp);