From aa0e2887f4841bb74ae042e9d7e2af6ea3df5b39 Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Mon, 6 Jul 2015 18:53:56 +0000 Subject: [PATCH] tty: replace several curthread->td_proc with stored curproc No functional changes. --- sys/kern/tty_tty.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index 07d835815bd..582b41ab586 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -58,25 +58,27 @@ static void ctty_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev) { + struct proc *p; if (*dev != NULL) return; if (strcmp(name, "tty")) return; + p = curproc; sx_sunlock(&clone_drain_lock); sx_slock(&proctree_lock); sx_slock(&clone_drain_lock); dev_lock(); - if (!(curthread->td_proc->p_flag & P_CONTROLT)) + if (!(p->p_flag & P_CONTROLT)) *dev = ctty; - else if (curthread->td_proc->p_session->s_ttyvp == NULL) + else if (p->p_session->s_ttyvp == NULL) *dev = ctty; - else if (curthread->td_proc->p_session->s_ttyvp->v_type == VBAD || - curthread->td_proc->p_session->s_ttyvp->v_rdev == NULL) { + else if (p->p_session->s_ttyvp->v_type == VBAD || + p->p_session->s_ttyvp->v_rdev == NULL) { /* e.g. s_ttyvp was revoked */ *dev = ctty; } else - *dev = curthread->td_proc->p_session->s_ttyvp->v_rdev; + *dev = p->p_session->s_ttyvp->v_rdev; dev_refl(*dev); dev_unlock(); sx_sunlock(&proctree_lock);