svn commit: r216593 - stable/8/sys/kern

[John Baldwin]

Author: jhb
Date: Mon Dec 20 17:08:22 2010
New Revision: 216593
URL: http://svn.freebsd.org/changeset/base/216593

Log:
  MFC 216504:
  Add back a bounds check on valid idle priorities that was lost in an
  earlier commit.  While here, move the thread lock down in rtp_to_pri().
  It is not needed for all of the priority value checks and the computation
  of newpri.
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/kern/kern_resource.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/kern/kern_resource.c
==============================================================================
--- stable/8/sys/kern/kern_resource.c	Mon Dec 20 16:39:43 2010	(r216592)
+++ stable/8/sys/kern/kern_resource.c	Mon Dec 20 17:08:22 2010	(r216593)
@@ -472,29 +472,27 @@ rtp_to_pri(struct rtprio *rtp, struct th
 	u_char	newpri;
 	u_char	oldpri;
 
-	thread_lock(td);
 	switch (RTP_PRIO_BASE(rtp->type)) {
 	case RTP_PRIO_REALTIME:
-		if (rtp->prio > RTP_PRIO_MAX) {
-			thread_unlock(td);
+		if (rtp->prio > RTP_PRIO_MAX)
 			return (EINVAL);
-		}
 		newpri = PRI_MIN_REALTIME + rtp->prio;
 		break;
 	case RTP_PRIO_NORMAL:
-		if (rtp->prio >  (PRI_MAX_TIMESHARE - PRI_MIN_TIMESHARE)) {
-			thread_unlock(td);
+		if (rtp->prio > (PRI_MAX_TIMESHARE - PRI_MIN_TIMESHARE))
 			return (EINVAL);
-		}
 		newpri = PRI_MIN_TIMESHARE + rtp->prio;
 		break;
 	case RTP_PRIO_IDLE:
+		if (rtp->prio > RTP_PRIO_MAX)
+			return (EINVAL);
 		newpri = PRI_MIN_IDLE + rtp->prio;
 		break;
 	default:
-		thread_unlock(td);
 		return (EINVAL);
 	}
+
+	thread_lock(td);
 	sched_class(td, rtp->type);	/* XXX fix */
 	oldpri = td->td_user_pri;
 	sched_user_prio(td, newpri);