diff options
| author | Seigo Tanimura <tanimura@FreeBSD.org> | 2002-02-23 11:12:57 +0000 |
|---|---|---|
| committer | Seigo Tanimura <tanimura@FreeBSD.org> | 2002-02-23 11:12:57 +0000 |
| commit | f591779bb575703cbb6674d324afb4bd212b8cbb (patch) | |
| tree | 2289c653c0f7aa23498f82b603c33107952652ec /sys/fs/procfs | |
| parent | 4aaca8854285a47e7fd520d5a2797dbf03d05bec (diff) | |
Notes
Diffstat (limited to 'sys/fs/procfs')
| -rw-r--r-- | sys/fs/procfs/procfs_ctl.c | 4 | ||||
| -rw-r--r-- | sys/fs/procfs/procfs_status.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c index 154eaa644b77..3a73980fd1fb 100644 --- a/sys/fs/procfs/procfs_ctl.c +++ b/sys/fs/procfs/procfs_ctl.c @@ -230,8 +230,10 @@ out: pp = pfind(p->p_oppid); PROC_LOCK(p); - if (pp) + if (pp) { + PROC_UNLOCK(pp); proc_reparent(p, pp); + } } else PROC_LOCK(p); p->p_oppid = 0; diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c index 0f8e34320b7e..9238dfe88681 100644 --- a/sys/fs/procfs/procfs_status.c +++ b/sys/fs/procfs/procfs_status.c @@ -48,6 +48,8 @@ #include <sys/mutex.h> #include <sys/jail.h> #include <sys/malloc.h> +#include <sys/mutex.h> +#include <sys/sx.h> #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/sbuf.h> @@ -75,9 +77,9 @@ procfs_doprocstatus(PFS_FILL_ARGS) pid = p->p_pid; PROC_LOCK(p); ppid = p->p_pptr ? p->p_pptr->p_pid : 0; - PROC_UNLOCK(p); pgid = p->p_pgrp->pg_id; sess = p->p_pgrp->pg_session; + SESS_LOCK(sess); sid = sess->s_leader ? sess->s_leader->p_pid : 0; /* comm pid ppid pgid sid maj,min ctty,sldr start ut st wmsg @@ -106,6 +108,8 @@ procfs_doprocstatus(PFS_FILL_ARGS) sbuf_printf(sb, "%ssldr", sep); sep = ","; } + SESS_UNLOCK(sess); + PROC_UNLOCK(p); if (*sep != ',') { sbuf_printf(sb, "noflags"); } |