From owner-p4-projects@FreeBSD.ORG  Sat Jul  1 16:51:24 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0498416A5F0; Sat,  1 Jul 2006 16:51:24 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BD64516A5B7
	for <perforce@FreeBSD.org>; Sat,  1 Jul 2006 16:51:23 +0000 (UTC)
	(envelope-from als@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7F62843D8A
	for <perforce@FreeBSD.org>; Sat,  1 Jul 2006 16:51:23 +0000 (GMT)
	(envelope-from als@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61GpNTA006164
	for <perforce@FreeBSD.org>; Sat, 1 Jul 2006 16:51:23 GMT
	(envelope-from als@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61GpNNJ006161
	for perforce@freebsd.org; Sat, 1 Jul 2006 16:51:23 GMT
	(envelope-from als@FreeBSD.org)
Date: Sat, 1 Jul 2006 16:51:23 GMT
Message-Id: <200607011651.k61GpNNJ006161@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	als@FreeBSD.org using -f
From: Alex Lyashkov <als@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 100401 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Jul 2006 16:51:24 -0000

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

Change 100401 by als@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>