svn commit: r213258 - head/sys/kern

[David Xu]

Author: davidxu
Date: Wed Sep 29 07:31:05 2010
New Revision: 213258
URL: http://svn.freebsd.org/changeset/base/213258

Log:
  - kern_sched_rr_get_interval should return interval for thread 1 in
    target process.
  - eliminate a goto.
  
  MFC after: 1 week

Modified:
  head/sys/kern/p1003_1b.c

Modified: head/sys/kern/p1003_1b.c
==============================================================================
--- head/sys/kern/p1003_1b.c	Wed Sep 29 06:06:58 2010	(r213257)
+++ head/sys/kern/p1003_1b.c	Wed Sep 29 07:31:05 2010	(r213258)
@@ -219,10 +219,8 @@ sched_getscheduler(struct thread *td, st
 		PROC_LOCK(targetp);
 	} else {
 		targetp = pfind(uap->pid);
-		if (targetp == NULL) {
-			e = ESRCH;
-			goto done2;
-		}
+		if (targetp == NULL)
+			return (ESRCH);
 		targettd = FIRST_THREAD_IN_PROC(targetp);
 	}
 
@@ -233,7 +231,6 @@ sched_getscheduler(struct thread *td, st
 	}
 	PROC_UNLOCK(targetp);
 
-done2:
 	return (e);
 }
 
@@ -293,13 +290,10 @@ kern_sched_rr_get_interval(struct thread
 		targetp = td->td_proc;
 		PROC_LOCK(targetp);
 	} else {
-		targetp = td->td_proc;
-		PROC_LOCK(targetp);
-		targettd = thread_find(targetp, pid);
-		if (targettd == NULL) {
-			PROC_UNLOCK(targetp);
+		targetp = pfind(pid);
+		if (targetp == NULL)
 			return (ESRCH);
-		}
+		targettd = FIRST_THREAD_IN_PROC(targetp);
 	}
 
 	e = p_cansee(td, targetp);