PERFORCE change 100114 for review

[Alex Lyashkov]

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

Change 100114 by als at als_head on 2006/06/27 05:11:37

	whitespace fixes. introduce storage for pointers to private module data.

Affected files ...

.. //depot/projects/jail2/sys/sys/jail.h#3 edit

Differences ...

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

@@ -24,7 +24,7 @@
 	int		 pr_version;
 	int		 pr_id;
 	char		 pr_path[MAXPATHLEN];
-	char 		 pr_host[MAXHOSTNAMELEN];
+	char		 pr_host[MAXHOSTNAMELEN];
 	u_int32_t	 pr_ip;				/* network order */
 };
 #define	XPRISON_VERSION	1
@@ -56,6 +56,7 @@
 
 #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>
@@ -73,29 +74,30 @@
  *       required to read
  *   (d) set only during destruction of jail, no mutex needed
  *   (n) not need locking or atomic operation
- *   (i) have internal locker 
+ *   (i) have internal locker
  */
 struct prison {
-	LIST_ENTRY(prison) 	 pr_list;			/* (a) all prisons */
-	int		 	 pr_id;				/* (c) prison id */
-	int		 	 pr_refcnt;			/* (p) refcount */
+	LIST_ENTRY(prison)	 pr_list;			/* (a) all prisons */
+	int			 pr_id;				/* (c) prison id */
+	int			 pr_refcnt;			/* (p) refcount */
 
-	uint32_t	 	 pr_flags;			/* (n) flags for jails restructions 
+	uint32_t		 pr_flags;			/* (n) flags for jails restructions
 								 * see J_*_FL in jail_flags.h
 								 */
-	char 		 	 pr_host[MAXHOSTNAMELEN];	/* (p) jail hostname */
+	char			 pr_host[MAXHOSTNAMELEN];	/* (p) jail hostname */
 	void			*pr_linux;			/* (p) linux abi */
-	int		 	 pr_securelevel;		/* (p) securelevel */
-	struct task	 	 pr_task;			/* (d) destroy task */
-	struct mtx	 	 pr_mtx;
-	struct jail_tasks 	 pr_tasks;			/* (i) tasks in jail */
-	struct jail_disks 	 pr_disk;			/* (i) disk usage */
-	struct jail_network 	 pr_network;			/* (i) network for jail */	
-	struct jail_sysvipc 	 pr_ipc;			/* (n) SYSV IPC for jail */
-	struct jail_limits 	 pr_limits;			/* (n) various limits for jail */
+	int			 pr_securelevel;		/* (p) securelevel */
+	struct task		 pr_task;			/* (d) destroy task */
+	struct mtx		 pr_mtx;
+	struct jail_tasks	 pr_tasks;			/* (i) tasks in jail */
+	struct jail_disks	 pr_disk;			/* (i) disk usage */
+	struct jail_network	 pr_network;			/* (i) network for jail */
+	struct jail_sysvipc	 pr_ipc;			/* (n) SYSV IPC for jail */
+	struct jail_limits	 pr_limits;			/* (n) various limits for jail */
 								/* (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 */	
+	u_long			 uihash;			/* (c) size of hash table - 1 */
+	void			*mod_data[JMODULE_COUNT]	/* (i) modules private data */
 };
 #endif /* _KERNEL || _WANT_PRISON */
 
@@ -127,7 +129,7 @@
 int prison_canseemount(struct ucred *cred, struct mount *mp);
 void prison_enforce_statfs(struct ucred *cred, struct mount *mp,
     struct statfs *sp);
-    
+
 /* jails control */
 struct prison *prison_alloc(uint32_t ctx_id);
 struct prison *prison_find(int prid);
@@ -136,7 +138,7 @@
 
 /* task control */
 int jail_migrate(struct thread *td, struct prison *pr);
-    
+
 /* network */
 int prison_if(struct ucred *cred, struct sockaddr *sa);
 int prison_ip(struct ucred *cred, uint32_t *ip);