[SSI] openssi/kernel/ipc msg.c, 1.14, 1.15 sem.c, 1.30, 1.31 shm.c, 1.25, 1.26 util.h, 1.11, 1.12

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

Modified Files:
      Tag: OPENSSI-DEBIAN
	msg.c sem.c shm.c util.h 
Log Message:
Clean up exports from cluster/ssi/ipc/ to ipc/


Index: util.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/ipc/util.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- util.h	27 Oct 2009 03:18:30 -0000	1.11
+++ util.h	17 Jan 2010 11:57:05 -0000	1.12
@@ -89,6 +89,7 @@
 extern void ipc_drop_locks(int, struct kern_ipc_perm *, struct ipc_ids *, int);
 extern void __init ssi_ipc_nodehint_init(clusternode_t **, int *, int, int);
 extern void *ssi_ipc_nodehint_realloc(clusternode_t **, int *, int *, int *);
+extern int ipc_grow_ary(struct ipc_ids *, int);
 #endif
 
 void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out);

Index: sem.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/ipc/sem.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- sem.c	27 Oct 2009 03:18:30 -0000	1.30
+++ sem.c	17 Jan 2010 11:57:05 -0000	1.31
@@ -78,9 +78,11 @@
 #ifdef CONFIG_SSI
 #include <cluster/icsgen.h>
 #include <cluster/clms.h>
+#include <cluster/ssi/ipc/sem.h>
 #include <cluster/ssi/namesvr.h>
 #include <cluster/nsc.h>
 #include <cluster/nodelist.h>
+#include <cluster/gen/ics_ipc_protos_gen.h>
 #endif /* CONFIG_SSI */
 
 #define sem_lock(id)	((struct sem_array*)ipc_lock(&sem_ids,id))
@@ -137,20 +139,6 @@
 #define sc_semmni	(sem_ctls[3])
 
 #ifdef CONFIG_SSI
-extern int cli_ipcname_findid(int, int, key_t *, clusternode_t *, int *,
-			      int *, int *);
-extern int cli_ipcname_rmid(int, global_id_t);
-extern int cli_ripc_semctl(clusternode_t, int *, int, int, int,
-			   ssi_procstate_t *, union semun *, int);
-extern int cli_ripc_semop(clusternode_t, int *, int, unsigned,
-			  ssi_procstate_t *, ics_userbuf_t *, ics_userbuf_t *);
-extern int cli_ripc_semexit(clusternode_t, int *, ssi_procstate_t *, int,
-			    pid_t);
-extern int cli_ipcname_gettotal(int, struct ssi_nodeid_pair **, int *);
-extern int ssi_sem_get_sem_array(clusternode_t, int, char **);
-
-extern clusternode_t name_server_node;
-
 void ssi_semexit(int semid, pid_t pid);
 
 static void freeundos(int);

Index: shm.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/ipc/shm.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- shm.c	27 Oct 2009 03:18:30 -0000	1.25
+++ shm.c	17 Jan 2010 11:57:05 -0000	1.26
@@ -41,14 +41,6 @@
 #include "util.h"
 
 #ifdef CONFIG_SSI
-extern int cli_ipcname_findid(int, int, key_t *, clusternode_t *, int *, int *, int *);
-extern int cli_ipcname_gettotal(int objtype, struct ssi_nodeid_pair **, int *);
-extern int cli_ipcname_rmid(int, global_id_t);
-extern int ssi_shmctl(clusternode_t, int, int, struct shmid_ds *);
-extern int ssi_shm_get_shmid_kernel(clusternode_t, int, char **, int *, int *);
-extern int ipc_grow_ary(struct ipc_ids *, int);
-extern void ipc_drop_locks(int, struct kern_ipc_perm *, struct ipc_ids *, int);
-extern struct kern_ipc_perm * ipc_get_locks(int, struct ipc_ids *, int);
 long ssi_shmget(key_t, size_t, int);
 long shm_get_segsize(struct shmid_kernel *);
 long shm_get_cpid(struct shmid_kernel *);

Index: msg.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/ipc/msg.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- msg.c	27 Oct 2009 03:18:30 -0000	1.14
+++ msg.c	17 Jan 2010 11:57:05 -0000	1.15
@@ -33,22 +33,11 @@
 #ifdef CONFIG_SSI
 #include <cluster/clms.h>
 #include <cluster/ssisys.h>
+#include <cluster/ssi/ipc/msg.h>
 #include <cluster/ssi/namesvr.h>
 #include <cluster/nsc.h>
 #include <cluster/nodelist.h>
-
-extern int cli_ipcname_findid(int, int, key_t *, clusternode_t *, int *,
-			      int *, int *);
-extern int cli_ipcname_gettotal(int objtype, struct ssi_nodeid_pair **, int *);
-extern int cli_ipcname_rmid(int service, global_id_t glid);
-extern int cli_ripc_msgctl(clusternode_t, int *, int, int, ssi_procstate_t *,
-			   long *);
-extern int ssi_msg_get_msg_queue(clusternode_t, int, char **);
-extern int cli_ripc_msgrcv(clusternode_t, int *, int, size_t, long msgtyp, int,
-			   char **, int *, long *);
-extern int cli_ripc_msgsnd(clusternode_t, int *, int, struct msg_msg *, 
-			   int, char *, int, int);
-extern clusternode_t name_server_node;
+#include <cluster/gen/ics_ipc_protos_gen.h>
 
 #define MSG_MAX_ID		(local_view ? msg_ids.max_id : size-1)
 #define MSG_IPC_ID(i,seq)	(local_view ? msg_buildid(i,seq) : ipc_id)


------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev