diff options
author | bde <bde@FreeBSD.org> | 1996-09-03 14:25:27 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1996-09-03 14:25:27 +0000 |
commit | 51ff523803ffa72907ef0cb5d9f95e36ac2b1b73 (patch) | |
tree | ba9e41138a27f4565955ba86fe3a5a131647e3fc /sys/fs | |
parent | ad9b91037fe27c080ad2621696ce946fffdee225 (diff) | |
download | FreeBSD-src-51ff523803ffa72907ef0cb5d9f95e36ac2b1b73.zip FreeBSD-src-51ff523803ffa72907ef0cb5d9f95e36ac2b1b73.tar.gz |
Eliminated nested include of <sys/unistd.h> in <sys/file.h> in the kernel.
Include it directly in the few places where it is used.
Reduced some #includes of <sys/file.h> to #includes of <sys/fcntl.h> or
nothing.
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/fdescfs/fdesc_vnops.c | 3 | ||||
-rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 3 | ||||
-rw-r--r-- | sys/fs/msdosfs/msdosfs_vnops.c | 4 | ||||
-rw-r--r-- | sys/fs/portalfs/portal_vnops.c | 3 | ||||
-rw-r--r-- | sys/fs/procfs/procfs_vnops.c | 5 | ||||
-rw-r--r-- | sys/fs/specfs/spec_vnops.c | 5 |
6 files changed, 14 insertions, 9 deletions
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 27adb43..8b08090 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -35,7 +35,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $Id: fdesc_vnops.c,v 1.16 1996/06/12 03:37:02 davidg Exp $ + * $Id: fdesc_vnops.c,v 1.17 1996/06/12 05:09:52 gpalmer Exp $ */ /* @@ -48,6 +48,7 @@ #include <sys/kernel.h> /* boottime */ #include <sys/resourcevar.h> #include <sys/filedesc.h> +#include <sys/unistd.h> #include <sys/vnode.h> #include <sys/malloc.h> #include <sys/file.h> diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index e6f1fee..ded0d5f 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.2 (Berkeley) 1/4/94 - * $Id: fifo_vnops.c,v 1.15 1995/12/14 09:53:03 phk Exp $ + * $Id: fifo_vnops.c,v 1.16 1996/02/13 18:16:23 wollman Exp $ */ #include <sys/param.h> @@ -39,6 +39,7 @@ #include <sys/proc.h> #include <sys/time.h> #include <sys/namei.h> +#include <sys/unistd.h> #include <sys/vnode.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 83efc30..bdd399f 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vnops.c,v 1.30 1995/12/07 12:47:20 davidg Exp $ */ +/* $Id: msdosfs_vnops.c,v 1.31 1996/06/14 11:01:41 asami Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $ */ /*- @@ -53,11 +53,11 @@ #include <sys/namei.h> #include <sys/resourcevar.h> /* defines plimit structure in proc struct */ #include <sys/kernel.h> -#include <sys/file.h> /* define FWRITE ... */ #include <sys/stat.h> #include <sys/buf.h> #include <sys/proc.h> #include <sys/mount.h> +#include <sys/unistd.h> #include <sys/vnode.h> #include <miscfs/specfs/specdev.h> /* XXX */ /* defines v_rdev */ #include <sys/malloc.h> diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index e1ae904..a9d7328 100644 --- a/sys/fs/portalfs/portal_vnops.c +++ b/sys/fs/portalfs/portal_vnops.c @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94 * - * $Id: portal_vnops.c,v 1.12 1996/06/12 03:37:29 davidg Exp $ + * $Id: portal_vnops.c,v 1.13 1996/06/12 05:09:59 gpalmer Exp $ */ /* @@ -50,6 +50,7 @@ #include <sys/time.h> #include <sys/proc.h> #include <sys/filedesc.h> +#include <sys/unistd.h> #include <sys/vnode.h> #include <sys/file.h> #include <sys/stat.h> diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c index 6325969..cd1a550 100644 --- a/sys/fs/procfs/procfs_vnops.c +++ b/sys/fs/procfs/procfs_vnops.c @@ -36,7 +36,7 @@ * * @(#)procfs_vnops.c 8.6 (Berkeley) 2/7/94 * - * $Id: procfs_vnops.c,v 1.22 1996/06/17 22:43:36 dyson Exp $ + * $Id: procfs_vnops.c,v 1.23 1996/06/18 05:16:00 dyson Exp $ */ /* @@ -47,8 +47,9 @@ #include <sys/systm.h> #include <sys/time.h> #include <sys/kernel.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/proc.h> +#include <sys/unistd.h> #include <sys/vnode.h> #include <sys/namei.h> #include <sys/malloc.h> diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index 58241c2..6df8bad 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.6 (Berkeley) 4/9/94 - * $Id: spec_vnops.c,v 1.30 1996/07/27 03:50:31 dyson Exp $ + * $Id: spec_vnops.c,v 1.31 1996/08/21 21:55:33 dyson Exp $ */ #include <sys/param.h> @@ -42,11 +42,12 @@ #include <sys/buf.h> #include <sys/mount.h> #include <sys/namei.h> +#include <sys/unistd.h> #include <sys/vnode.h> #include <sys/stat.h> #include <sys/errno.h> #include <sys/ioctl.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/disklabel.h> #include <sys/vmmeter.h> |