summaryrefslogtreecommitdiffstats
path: root/sys/ufs
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1997-03-23 03:37:54 +0000
committerbde <bde@FreeBSD.org>1997-03-23 03:37:54 +0000
commit0d3591bdbd3a026b25e6400f8cc2717489321ee5 (patch)
tree6f29bb8eda668548be86212b07bea087a25e6b3d /sys/ufs
parent9c1cce114fbef8364b2d49669b0215e8bac94fd3 (diff)
downloadFreeBSD-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/ufs')
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c4
-rw-r--r--sys/ufs/lfs/lfs_vfsops.c4
-rw-r--r--sys/ufs/ufs/ufs_quota.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index c63e5b7..6250975 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95
- * $Id: ffs_vfsops.c,v 1.48 1997/03/18 19:50:12 peter Exp $
+ * $Id: ffs_vfsops.c,v 1.49 1997/03/22 06:53:30 bde Exp $
*/
#include "opt_quota.h"
@@ -46,7 +46,7 @@
#include <sys/mount.h>
#include <sys/buf.h>
#include <sys/mbuf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
#include <sys/disklabel.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index 265a580..0b85cdd 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)lfs_vfsops.c 8.20 (Berkeley) 6/10/95
- * $Id: lfs_vfsops.c,v 1.16 1997/02/22 09:47:25 peter Exp $
+ * $Id: lfs_vfsops.c,v 1.17 1997/03/23 00:45:23 bde Exp $
*/
#include "opt_quota.h"
@@ -45,7 +45,7 @@
#include <sys/mount.h>
#include <sys/buf.h>
#include <sys/mbuf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
#include <sys/disklabel.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 416df5b..ce9ef41 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_quota.c 8.5 (Berkeley) 5/20/95
- * $Id: ufs_quota.c,v 1.11 1997/02/22 09:47:50 peter Exp $
+ * $Id: ufs_quota.c,v 1.12 1997/03/09 06:10:34 mpp Exp $
*/
#include "opt_quota.h" /* not really necessary... */
@@ -44,7 +44,7 @@
#include <sys/systm.h>
#include <sys/namei.h>
#include <sys/malloc.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/mount.h>
OpenPOWER on IntegriCloud