- Assert that the proc lock and sched_lock are held in sched_nice().

- For the 4BSD scheduler, this means that all callers of the static
  function resetpriority() now always hold sched_lock, so don't lock
  sched_lock explicitly in that function.

1 files changed, 3 insertions, 2 deletions

diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c
index 219405f..ee20384 100644
--- a/sys/kern/sched_4bsd.c
+++ b/sys/kern/sched_4bsd.c
@@ -378,7 +378,6 @@ resetpriority(struct ksegrp *kg)
 	register unsigned int newpriority;
 	struct thread *td;
 
-	mtx_lock_spin(&sched_lock);
 	if (kg->kg_pri_class == PRI_TIMESHARE) {
 		newpriority = PUSER + kg->kg_estcpu / INVERSE_ESTCPU_WEIGHT +
 		    NICE_WEIGHT * (kg->kg_nice - PRIO_MIN);
@@ -389,7 +388,6 @@ resetpriority(struct ksegrp *kg)
 	FOREACH_THREAD_IN_GROUP(kg, td) {
 		maybe_resched(td);			/* XXXKSE silly */
 	}
-	mtx_unlock_spin(&sched_lock);
 }
 
 /* ARGSUSED */
@@ -514,6 +512,9 @@ sched_fork_thread(struct thread *td, struct thread *child)
 void
 sched_nice(struct ksegrp *kg, int nice)
 {
+
+	PROC_LOCK_ASSERT(kg->kg_proc, MA_OWNED);
+	mtx_assert(&sched_lock, MA_OWNED);
 	kg->kg_nice = nice;
 	resetpriority(kg);
 }