Don't #include <sys/fcntl.h> in <sys/file.h> if KERNEL is defined.

Fixed everything that depended on getting fcntl.h stuff from the wrong
place.  Most things don't depend on file.h stuff at all.

19 files changed, 37 insertions, 29 deletions

diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 5867fde..525d76d 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: imgact_elf.c,v 1.16 1997/02/22 09:38:56 peter Exp $
  */
 
 #include "opt_rlimit.h"
@@ -40,7 +40,7 @@
 #include <sys/imgact_elf.h>
 #include <sys/kernel.h>
 #include <sys/sysent.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 662562b..fbbe6f4 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_acct.c	8.1 (Berkeley) 6/14/93
- *	$Id$
+ *	$Id: kern_acct.c,v 1.13 1997/02/22 09:39:00 peter Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,7 @@
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/syslog.h>
 #include <sys/kernel.h>
 #include <sys/sysent.h>
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index b2f73ed..f8e4e25 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_ktrace.c	8.2 (Berkeley) 9/23/93
- * $Id$
+ * $Id: kern_ktrace.c,v 1.17 1997/02/22 09:39:05 peter Exp $
  */
 
 #include "opt_ktrace.h"
@@ -40,7 +40,7 @@
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/proc.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/ktrace.h>
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 19e0290..16fd67b 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_lkm.c,v 1.36 1997/02/22 09:39:06 peter Exp $
+ * $Id: kern_lkm.c,v 1.37 1997/02/27 16:40:20 bde Exp $
  */
 
 #include <sys/param.h>
@@ -39,7 +39,7 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 772e054..e0b28e0 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
- * $Id$
+ * $Id: kern_sig.c,v 1.30 1997/02/22 09:39:11 peter Exp $
  */
 
 #include "opt_ktrace.h"
@@ -54,7 +54,7 @@
 #include <sys/times.h>
 #include <sys/buf.h>
 #include <sys/acct.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/wait.h>
 #include <sys/ktrace.h>
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index d76bd6c..a2d31dd 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: subr_log.c,v 1.20 1997/02/22 09:39:16 peter Exp $
  */
 
 /*
@@ -45,7 +45,7 @@
 #include <sys/vnode.h>
 #include <sys/ioctl.h>
 #include <sys/msgbuf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #ifdef DEVFS
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 67ac7c5..5bbb3f1 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
- * $Id: sys_generic.c,v 1.23 1997/02/22 09:39:19 peter Exp $
+ * $Id: sys_generic.c,v 1.24 1997/03/22 08:03:36 bde Exp $
  */
 
 #include "opt_ktrace.h"
@@ -46,6 +46,7 @@
 #include <sys/sysproto.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 66b0ac7..71bbed0 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: sys_pipe.c,v 1.24 1997/02/22 09:39:19 peter Exp $
+ * $Id: sys_pipe.c,v 1.25 1997/03/22 06:52:57 bde Exp $
  */
 
 #ifndef OLD_PIPE
@@ -54,6 +54,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/protosw.h>
 #include <sys/stat.h>
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index eab70de..f8b027d 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_socket.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: sys_socket.c,v 1.10 1997/02/22 09:39:20 peter Exp $
  */
 
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index a1e516d..e598206 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.91 1997/02/22 09:39:23 peter Exp $
+ * $Id: tty.c,v 1.92 1997/03/22 06:52:58 bde Exp $
  */
 
 /*-
@@ -77,7 +77,7 @@
 #define	TTYDEFCHARS
 #include <sys/tty.h>
 #undef	TTYDEFCHARS
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/uio.h>
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index c72c15f..6326fda 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
- * $Id$
+ * $Id: tty_pty.c,v 1.41 1997/02/22 09:39:25 peter Exp $
  */
 
 /*
@@ -46,7 +46,7 @@
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 0e14b60..fbb6f91 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -23,7 +23,7 @@
 #include <sys/ioctl_compat.h>	/* Oooh..We need O/NTTYDISC	 */
 #include <sys/proc.h>
 #include <sys/tty.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 40e5baf..b1acc26 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $Id$
+ * $Id: tty_tty.c,v 1.14 1997/02/22 09:39:27 peter Exp $
  */
 
 /*
@@ -44,7 +44,7 @@
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/vnode.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/kernel.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 7fdfca8..9f70207 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,14 +31,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
- *	$Id: uipc_socket.c,v 1.23 1997/02/22 09:39:28 peter Exp $
+ *	$Id: uipc_socket.c,v 1.24 1997/02/24 20:30:56 wollman Exp $
  */
 
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 756e960..e3aca30 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
- * $Id$
+ * $Id: uipc_syscalls.c,v 1.22 1997/02/22 09:39:29 peter Exp $
  */
 
 #include "opt_ktrace.h"
@@ -41,6 +41,7 @@
 #include <sys/sysproto.h>
 #include <sys/filedesc.h>
 #include <sys/proc.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 3c68f05..0a47414 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
- *	$Id: uipc_usrreq.c,v 1.20 1997/02/24 20:30:58 wollman Exp $
+ *	$Id: uipc_usrreq.c,v 1.21 1997/03/21 16:12:32 wpaul Exp $
  */
 
 #include <sys/param.h>
@@ -39,6 +39,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/domain.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/mbuf.h>
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 26e9867..6404a8c 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.58 1997/02/22 09:39:35 peter Exp $
+ * $Id: vfs_syscalls.c,v 1.59 1997/03/05 01:42:14 msmith Exp $
  */
 
 /*
@@ -55,6 +55,7 @@
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/unistd.h>
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 26e9867..6404a8c 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.58 1997/02/22 09:39:35 peter Exp $
+ * $Id: vfs_syscalls.c,v 1.59 1997/03/05 01:42:14 msmith Exp $
  */
 
 /*
@@ -55,6 +55,7 @@
 #include <sys/namei.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/unistd.h>
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 31d2c23..431913f 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,12 +36,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.31 1997/03/07 07:42:41 gpalmer Exp $
+ * $Id: vfs_vnops.c,v 1.32 1997/03/08 15:14:30 guido Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/buf.h>