PERFORCE change 100401 for review

[Alex Lyashkov]

http://perforce.freebsd.org/chv.cgi?CH=100401

Change 100401 by als at als_head on 2006/07/01 16:50:26

	move JMODULE_COUNT into jail. it`s make unneed include jail2_init.h.

Affected files ...

.. //depot/projects/jail2/sys/sys/jail.h#4 edit
.. //depot/projects/jail2/sys/sys/jail2_init.h#2 edit

Differences ...

==== //depot/projects/jail2/sys/sys/jail.h#4 (text+ko) ====

@@ -47,6 +47,8 @@
 #define JAIL_MAX	999999
 #define JAIL_MIN	1
 
+#define JMODULE_COUNT	3
+
 #ifdef MALLOC_DECLARE
 MALLOC_DECLARE(M_PRISON);
 #endif
@@ -56,7 +58,6 @@
 
 #include <sys/jail2_disks.h>
 #include <sys/jail2_ipc.h>
-#include <sys/jail2_init.h>
 #include <sys/jail2_flags.h>
 #include <sys/jail2_limits.h>
 #include <sys/jail2_network.h>
@@ -97,7 +98,7 @@
 								/* (c) per jail uid info  */
 	LIST_HEAD(uihashhead, uidinfo) *uihashtbl;		/* (i) also protected with uihash mutex */
 	u_long			 uihash;			/* (c) size of hash table - 1 */
-	void			*mod_data[JMODULE_COUNT]	/* (i) modules private data */
+	void			*mod_data[JMODULE_COUNT];	/* (i) modules private data */
 };
 #endif /* _KERNEL || _WANT_PRISON */
 

==== //depot/projects/jail2/sys/sys/jail2_init.h#2 (text+ko) ====

@@ -3,14 +3,12 @@
 #define _JAIL2_INIT_H_
 
 enum jail_modules_id {
-	JMODULE_NODATA	=		-1;
-	JMODULE_SYSVMSQ	=		0;
-	JMODULE_SYSVSEM	=		1;
-	JMODULE_SYSVSHM	=		2;
+	JMODULE_NODATA	=		-1,
+	JMODULE_SYSVMSQ	=		0,
+	JMODULE_SYSVSEM	=		1,
+	JMODULE_SYSVSHM	=		2
 };
 
-#define JMODULE_COUNT	3
-
 #ifdef _KERNEL
 
 #include <sys/queue.h>