Make fdunshare accept only td parameter.
Proc had to match the thread anyway and 2 parameters were inconsistent with the rest. MFC after: 1 week
This commit is contained in:
parent
35778d7aa9
commit
b9d32c36fa
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=268001
@ -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;
|
||||
|
@ -594,7 +594,7 @@ do_execve(td, args, mac_p)
|
||||
* 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.
|
||||
|
@ -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) &&
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user