diff options
| author | bde <bde@FreeBSD.org> | 1997-03-23 03:37:54 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-03-23 03:37:54 +0000 |
| commit | 0d3591bdbd3a026b25e6400f8cc2717489321ee5 (patch) | |
| tree | 6f29bb8eda668548be86212b07bea087a25e6b3d /sys/fs | |
| parent | 9c1cce114fbef8364b2d49669b0215e8bac94fd3 (diff) | |
| download | FreeBSD-src-0d3591bdbd3a026b25e6400f8cc2717489321ee5.zip FreeBSD-src-0d3591bdbd3a026b25e6400f8cc2717489321ee5.tar.gz | |
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.
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/cd9660/cd9660_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 3 | ||||
| -rw-r--r-- | sys/fs/msdosfs/msdosfs_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/fs/portalfs/portal_vnops.c | 3 | ||||
| -rw-r--r-- | sys/fs/unionfs/union_subr.c | 4 | ||||
| -rw-r--r-- | sys/fs/unionfs/union_vnops.c | 4 |
6 files changed, 12 insertions, 10 deletions
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 8ee2b8e..5c2bf7c 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $Id$ + * $Id: cd9660_vfsops.c,v 1.19 1997/02/22 09:38:50 peter Exp $ */ #include <sys/param.h> @@ -48,7 +48,7 @@ #include <miscfs/specfs/specdev.h> #include <sys/mount.h> #include <sys/buf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/malloc.h> diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 599697c..683c10b 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.10 (Berkeley) 5/27/95 - * $Id$ + * $Id: fifo_vnops.c,v 1.22 1997/02/22 09:40:17 peter Exp $ */ #include <sys/param.h> @@ -46,6 +46,7 @@ #include <sys/socketvar.h> #include <sys/stat.h> #include <sys/ioctl.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/errno.h> #include <sys/malloc.h> diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index cf37d4d..896c4f0 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vfsops.c,v 1.17 1997/02/26 14:23:14 bde Exp $ */ +/* $Id: msdosfs_vfsops.c,v 1.18 1997/03/18 19:50:10 peter Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */ /*- @@ -57,7 +57,7 @@ #include <miscfs/specfs/specdev.h> /* XXX */ /* defines v_rdev */ #include <sys/mount.h> #include <sys/buf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/malloc.h> #include <msdosfs/bpb.h> diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index c46668f..b8118a8 100644 --- a/sys/fs/portalfs/portal_vnops.c +++ b/sys/fs/portalfs/portal_vnops.c @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95 * - * $Id$ + * $Id: portal_vnops.c,v 1.17 1997/02/22 09:40:25 peter Exp $ */ /* @@ -52,6 +52,7 @@ #include <sys/filedesc.h> #include <sys/unistd.h> #include <sys/vnode.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/mount.h> diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 063cd44d..a437b54 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_subr.c 8.20 (Berkeley) 5/20/95 - * $Id$ + * $Id: union_subr.c,v 1.14 1997/02/22 09:40:40 peter Exp $ */ #include <sys/param.h> @@ -45,7 +45,7 @@ #include <sys/vnode.h> #include <sys/namei.h> #include <sys/malloc.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/filedesc.h> #include <sys/queue.h> #include <sys/mount.h> diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index ae6a712..7909706 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -35,13 +35,13 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $Id$ + * $Id: union_vnops.c,v 1.19 1997/02/22 09:40:42 peter Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/time.h> #include <sys/stat.h> #include <sys/types.h> |
