CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sun May  1 02:46:19 UTC 2011

Modified Files:
        src/sys/kern: kern_resource.c

Log Message:
if donice fails, don't keep going with the next process.


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/kern/kern_resource.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/kern_resource.c
diff -u src/sys/kern/kern_resource.c:1.161 src/sys/kern/kern_resource.c:1.162
--- src/sys/kern/kern_resource.c:1.161	Sat Apr 30 21:15:18 2011
+++ src/sys/kern/kern_resource.c	Sat Apr 30 22:46:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_resource.c,v 1.161 2011/05/01 01:15:18 rmind Exp $	*/
+/*	$NetBSD: kern_resource.c,v 1.162 2011/05/01 02:46:19 christos Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.161 2011/05/01 01:15:18 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_resource.c,v 1.162 2011/05/01 02:46:19 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -233,9 +233,9 @@
 		p = who ? proc_find(who) : curp;
 		if (p != NULL) {
 			mutex_enter(p->p_lock);
+			found++;
 			error = donice(l, p, SCARG(uap, prio));
 			mutex_exit(p->p_lock);
-			found++;
 		}
 		break;
 
@@ -248,9 +248,11 @@
 			break;
 		LIST_FOREACH(p, &pg->pg_members, p_pglist) {
 			mutex_enter(p->p_lock);
+			found++;
 			error = donice(l, p, SCARG(uap, prio));
 			mutex_exit(p->p_lock);
-			found++;
+			if (error)
+				break;
 		}
 		break;
 	}
@@ -262,10 +264,12 @@
 			mutex_enter(p->p_lock);
 			if (kauth_cred_geteuid(p->p_cred) ==
 			    (uid_t)SCARG(uap, who)) {
-				error = donice(l, p, SCARG(uap, prio));
 				found++;
+				error = donice(l, p, SCARG(uap, prio));
 			}
 			mutex_exit(p->p_lock);
+			if (error)
+				break;
 		}
 		break;
 
@@ -275,8 +279,8 @@
 	}
 	mutex_exit(proc_lock);
 	if (found == 0)
-		return (ESRCH);
-	return (error);
+		return ESRCH;
+	return error;
 }
 
 /*