From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 15 Nov 2006 14:44:16 -0000
Subject: [Cluster-devel] cluster/group daemon/main.c dlm_controld/main. ...
Message-ID: <20061115144416.9817.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL50
Changes by:	teigland at sourceware.org	2006-11-15 14:44:15

Modified files:
	group/daemon   : main.c 
	group/dlm_controld: main.c 
	group/gfs_controld: main.c 

Log message:
	fix sched_priority from sdake

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/main.c.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.51&r2=1.51.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/main.c.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.6&r2=1.6.4.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/main.c.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.18.4.1&r2=1.18.4.2

--- cluster/group/daemon/main.c	2006/10/24 17:08:06	1.51
+++ cluster/group/daemon/main.c	2006/11/15 14:44:12	1.51.4.1
@@ -136,6 +136,8 @@
 	char *argv[4];
 	int status, rv = 0;
 
+	/* FIXME: ignore gfs/gfs2 nolock fs's */
+
 	rv += kernel_instance_count("/sys/kernel/dlm");
 	rv += kernel_instance_count("/sys/fs/gfs");
 	rv += kernel_instance_count("/sys/fs/gfs2");
@@ -892,7 +894,7 @@
 
 	rv = sched_get_priority_max(SCHED_RR);
 	if (rv != -1) {
-		sched_param.sched_priority = 2;
+		sched_param.sched_priority = rv;
 		rv = sched_setscheduler(0, SCHED_RR, &sched_param);
 		if (rv == -1)
 			log_print("could not set SCHED_RR priority %d err %d",
--- cluster/group/dlm_controld/main.c	2006/10/24 16:16:31	1.6
+++ cluster/group/dlm_controld/main.c	2006/11/15 14:44:13	1.6.4.1
@@ -389,7 +389,6 @@
 	}
 }
 
-#if 0
 void set_scheduler(void)
 {
 	struct sched_param sched_param;
@@ -397,7 +396,7 @@
 
 	rv = sched_get_priority_max(SCHED_RR);
 	if (rv != -1) {
-		sched_param.sched_priority = 2;
+		sched_param.sched_priority = rv;
 		rv = sched_setscheduler(0, SCHED_RR, &sched_param);
 		if (rv == -1)
 			log_error("could not set SCHED_RR priority %d err %d",
@@ -407,7 +406,6 @@
 			  errno);
 	}
 }
-#endif
 
 int main(int argc, char **argv)
 {
@@ -420,9 +418,7 @@
 	if (!daemon_debug_opt)
 		daemonize();
 
-#if 0
 	set_scheduler();
-#endif
 
 	return loop();
 }
--- cluster/group/gfs_controld/main.c	2006/11/14 21:30:59	1.18.4.1
+++ cluster/group/gfs_controld/main.c	2006/11/15 14:44:15	1.18.4.2
@@ -669,7 +669,7 @@
 
 	rv = sched_get_priority_max(SCHED_RR);
 	if (rv != -1) {
-		sched_param.sched_priority = 2;
+		sched_param.sched_priority = rv;
 		rv = sched_setscheduler(0, SCHED_RR, &sched_param);
 		if (rv == -1)
 			log_error("could not set SCHED_RR priority %d err %d",