svn commit: r194368 - in head/sys: compat/linux fs/nfsclient kern net netinet netinet6 sys

Bjoern A. Zeeb bz at FreeBSD.org
Wed Jun 17 15:01:01 UTC 2009


Author: bz
Date: Wed Jun 17 15:01:01 2009
New Revision: 194368
URL: http://svn.freebsd.org/changeset/base/194368

Log:
  Add explicit includes for jail.h to the files that need them and
  remove the "hidden" one from vimage.h.

Modified:
  head/sys/compat/linux/linux_ioctl.c
  head/sys/fs/nfsclient/nfs_clvnops.c
  head/sys/kern/kern_sysctl.c
  head/sys/net/bpf.c
  head/sys/net/if_tun.c
  head/sys/netinet/tcp_subr.c
  head/sys/netinet6/in6_proto.c
  head/sys/sys/vimage.h

Modified: head/sys/compat/linux/linux_ioctl.c
==============================================================================
--- head/sys/compat/linux/linux_ioctl.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/compat/linux/linux_ioctl.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/filio.h>
+#include <sys/jail.h>
 #include <sys/kbio.h>
 #include <sys/kernel.h>
 #include <sys/linker_set.h>

Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/fs/nfsclient/nfs_clvnops.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mount.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
+#include <sys/jail.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/namei.h>

Modified: head/sys/kern/kern_sysctl.c
==============================================================================
--- head/sys/kern/kern_sysctl.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/kern/kern_sysctl.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
+#include <sys/jail.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/sx.h>

Modified: head/sys/net/bpf.c
==============================================================================
--- head/sys/net/bpf.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/net/bpf.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
+#include <sys/jail.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/time.h>

Modified: head/sys/net/if_tun.c
==============================================================================
--- head/sys/net/if_tun.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/net/if_tun.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -25,6 +25,7 @@
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/jail.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/socket.h>

Modified: head/sys/netinet/tcp_subr.c
==============================================================================
--- head/sys/netinet/tcp_subr.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/netinet/tcp_subr.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
+#include <sys/jail.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #ifdef INET6

Modified: head/sys/netinet6/in6_proto.c
==============================================================================
--- head/sys/netinet6/in6_proto.c	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/netinet6/in6_proto.c	Wed Jun 17 15:01:01 2009	(r194368)
@@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/proc.h>
 #include <sys/protosw.h>
+#include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/domain.h>
 #include <sys/mbuf.h>

Modified: head/sys/sys/vimage.h
==============================================================================
--- head/sys/sys/vimage.h	Wed Jun 17 14:50:41 2009	(r194367)
+++ head/sys/sys/vimage.h	Wed Jun 17 15:01:01 2009	(r194368)
@@ -35,9 +35,6 @@
 
 #include <sys/proc.h>
 #include <sys/queue.h>
-#ifdef VIMAGE
-#include <sys/jail.h>
-#endif
 
 /* Interim userspace API. */
 struct vi_req {


More information about the svn-src-head mailing list