diff options
| author | kib <kib@FreeBSD.org> | 2010-05-10 15:19:12 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2010-05-10 15:19:12 +0000 |
| commit | 4ca9a130c3852e200cb06a9295498674091e4145 (patch) | |
| tree | 9c0ff39008b2f675e34709ba074046969173f87e | |
| parent | 0415e01577537dd559eca69bbc79a158cd6ad021 (diff) | |
| download | FreeBSD-src-4ca9a130c3852e200cb06a9295498674091e4145.zip FreeBSD-src-4ca9a130c3852e200cb06a9295498674091e4145.tar.gz | |
The thread_unsuspend() requires both process mutex and process spinlock
locked. Postpone the process unlock till the thread_unsuspend() is called.
Approved by: des (procfs maintainer)
MFC after: 1 week
| -rw-r--r-- | sys/fs/procfs/procfs_ctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c index 69e40a0..5980ce1 100644 --- a/sys/fs/procfs/procfs_ctl.c +++ b/sys/fs/procfs/procfs_ctl.c @@ -236,7 +236,6 @@ out: PROC_LOCK(p); p->p_oppid = 0; p->p_flag &= ~P_WAITED; /* XXX ? */ - PROC_UNLOCK(p); sx_xunlock(&proctree_lock); wakeup(td->td_proc); /* XXX for CTL_WAIT below ? */ @@ -249,9 +248,10 @@ out: */ case PROCFS_CTL_STEP: error = proc_sstep(FIRST_THREAD_IN_PROC(p)); - PROC_UNLOCK(p); - if (error) + if (error) { + PROC_UNLOCK(p); return (error); + } break; /* @@ -260,7 +260,6 @@ out: */ case PROCFS_CTL_RUN: p->p_flag &= ~P_STOPPED_SIG; /* this uses SIGSTOP */ - PROC_UNLOCK(p); break; /* @@ -292,6 +291,7 @@ out: PROC_SLOCK(p); thread_unsuspend(p); /* If it can run, let it do so. */ PROC_SUNLOCK(p); + PROC_UNLOCK(p); return (0); } |
