[SSI] openssi/kernel/fs/proc proc_cluster.c,1.16,1.17

Update of /cvsroot/ssic-linux/openssi/kernel/fs/proc
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31045/fs/proc

Modified Files:
      Tag: OPENSSI-FC
	proc_cluster.c 
Log Message:
Fix warnings on lp64 systems

Index: proc_cluster.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/fs/proc/proc_cluster.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- proc_cluster.c	27 Oct 2009 03:18:30 -0000	1.16
+++ proc_cluster.c	13 Feb 2010 14:57:54 -0000	1.17
@@ -62,7 +62,7 @@
 				 int count, int *eof, void *data)
 {
 	int len;
-	clusternode_t node = (clusternode_t)data;
+	clusternode_t node = (long)data;
 
 	len = sprintf(page,"%lu\n",
 #ifdef CONFIG_MOSIX_LL
@@ -216,7 +216,7 @@
 	/* Get node number */
 	dp = file->f_dentry;
 	de = PDE(dp->d_inode);
-	node = (clusternode_t)de->data;
+	node = (long)de->data;
 	if (node == this_node)
 		sprintf((char *)page, "%d\n",
 				(loadlvl_enabled ? atomic_read(&loadlevel_on) : -1));
@@ -281,7 +281,7 @@
 	}
 
 #ifdef PROC_CLUSTER_DIR_ENTRY_FIX
-	node = (clusternode_t) PDE(file->f_dentry->d_inode)->data;
+	node = (long)PDE(file->f_dentry->d_inode)->data;
 #else
 	/* Use the file struct to get the back pathwalk and
 	 * see which node its wants.
@@ -310,7 +310,7 @@
 #ifdef SSI_NOTYET
 static int proc_cluster_revalidate(struct dentry *dentry, struct nameidata *nd)
 {
-	clusternode_t node = (clusternode_t) PDE(dentry->d_inode)->data;
+	clusternode_t node = (long) PDE(dentry->d_inode)->data;
 
 	if (node && node != this_node && !clms_isnodeup(node)) {
 		struct proc_dir_entry *de;
@@ -320,7 +320,7 @@
 		lock_kernel();
 #ifdef CONFIG_LDLVL
 		for (de = proc_cluster->subdir; de ; de = de->next) {
-			if (node == (clusternode_t)de->data) {
+			if (node == (long)de->data) {
 				remove_proc_entry("loadlevel", de);
 				remove_proc_entry("load", de);
 				break;
@@ -361,14 +361,14 @@
 	sprintf(nodedir, "cluster/node%u", this_node);
 	proc_cluster_node = proc_mkdir(nodedir, 0);
 #endif
-	proc_cluster_node->data = (void *)this_node;
+	proc_cluster_node->data = (void *)(long)this_node;
 
 #ifdef CONFIG_LDLVL
 	/* Create load file which will contain the node's load average */
 	create_proc_read_entry("load", S_IFREG|S_IRUSR|S_IRGRP|S_IROTH,
 					proc_cluster_node,
 					proc_node_read_load,
-					(void *)this_node);
+					(void *)(long)this_node);
 
 	/* Create the loadlevel file which will turn on/off the loadleveler */
 	node_loadlevel_entry = create_proc_entry("loadlevel",
@@ -376,7 +376,7 @@
 							proc_cluster_node);
 	if (node_loadlevel_entry) {
 		node_loadlevel_entry->proc_fops = &proc_loadlevel_operations;
-		node_loadlevel_entry->data = (void *)this_node;
+		node_loadlevel_entry->data = (void *)(long)this_node;
 	}
 #else
 	(void)node_loadlevel_entry;
@@ -414,20 +414,20 @@
 				goto next_node;
 			}
 #endif
-			nodedir->data = (void *)node;
+			nodedir->data = (void *)(long)node;
 #ifdef CONFIG_LDLVL
 			create_proc_read_entry("load",
 					S_IFREG|S_IRUSR|S_IRGRP|S_IROTH,
 					nodedir,
 					proc_node_read_load,
-					(void *)node);
+					(void *)(long)node);
 
 			node_entry = create_proc_entry("loadlevel",
 				S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH,
 					nodedir);
 			if (node_entry) {
 				node_entry->proc_fops = &proc_loadlevel_operations;
-				node_entry->data = (void *)node;
+				node_entry->data = (void *)(long)node;
 			}
 #else
 			(void)node_entry;
@@ -444,7 +444,7 @@
 					dentry->d_name.name, de)) {
 				int ino = de->low_ino;
 
-				node = (clusternode_t) de->data;
+				node = (long) de->data;
 				if (node && node != this_node &&
 				    !clms_isnodeup(node))
 					break;


------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev