summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2010-05-18 04:41:15 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2010-05-18 04:41:15 +0000
commit2a8c476cc299b5156f773ee5184486606637e917 (patch)
tree30e6afac5430b625bb13529ef5157accc51637d9 /sys
parent5f7844d39f199b58e0025efc5d45e6ab79446132 (diff)
dont let sys/ioctl.h imply that you get the ioctls in dkio.h. this
gets rid of #include <sys/dkio.h> in sys/ioctl.h and adds #include <sys/dkio.h> to the places that actually want and use the disk ioctls. this became an issue when krw@'s X build failed when he was testing a change to dkio.h. tested by krw@ help from and ok miod@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sgi/stand/sgivol/sgivol.c3
-rw-r--r--sys/compat/linux/linux_blkio.c3
-rw-r--r--sys/compat/linux/linux_hdio.c3
-rw-r--r--sys/dev/ata/wd.c3
-rw-r--r--sys/dev/ccd.c3
-rw-r--r--sys/dev/isa/fd.c3
-rw-r--r--sys/dev/softraid.c3
-rw-r--r--sys/dev/softraid_crypto.c3
-rw-r--r--sys/dev/vnd.c3
-rw-r--r--sys/kern/spec_vnops.c3
-rw-r--r--sys/miscfs/specfs/spec_vnops.c3
-rw-r--r--sys/scsi/cd.c3
-rw-r--r--sys/scsi/sd.c3
-rw-r--r--sys/sys/ioctl.h3
-rw-r--r--sys/ufs/ext2fs/ext2fs_vfsops.c3
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c3
-rw-r--r--sys/uvm/uvm_vnode.c3
17 files changed, 33 insertions, 18 deletions
diff --git a/sys/arch/sgi/stand/sgivol/sgivol.c b/sys/arch/sgi/stand/sgivol/sgivol.c
index ff8da7ba4ef..1871983bb06 100644
--- a/sys/arch/sgi/stand/sgivol/sgivol.c
+++ b/sys/arch/sgi/stand/sgivol/sgivol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sgivol.c,v 1.16 2010/04/23 15:25:20 jsing Exp $ */
+/* $OpenBSD: sgivol.c,v 1.17 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: sgivol.c,v 1.8 2003/11/08 04:59:00 sekiya Exp $ */
/*-
@@ -45,6 +45,7 @@
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/dkio.h>
/*
* Some IRIX man pages refer to the size being a multiple of whole cylinders.
diff --git a/sys/compat/linux/linux_blkio.c b/sys/compat/linux/linux_blkio.c
index a38cca637c2..09f47187289 100644
--- a/sys/compat/linux/linux_blkio.c
+++ b/sys/compat/linux/linux_blkio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_blkio.c,v 1.7 2007/06/06 17:15:13 deraadt Exp $ */
+/* $OpenBSD: linux_blkio.c,v 1.8 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: linux_blkio.c,v 1.3 2001/01/18 17:48:04 tv Exp $ */
/*
@@ -44,6 +44,7 @@
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/disklabel.h>
+#include <sys/dkio.h>
#include <sys/syscallargs.h>
diff --git a/sys/compat/linux/linux_hdio.c b/sys/compat/linux/linux_hdio.c
index 4eb2edba747..ac96e740c10 100644
--- a/sys/compat/linux/linux_hdio.c
+++ b/sys/compat/linux/linux_hdio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_hdio.c,v 1.6 2007/06/05 00:38:20 deraadt Exp $ */
+/* $OpenBSD: linux_hdio.c,v 1.7 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: linux_hdio.c,v 1.1 2000/12/10 14:12:17 fvdl Exp $ */
/*
@@ -44,6 +44,7 @@
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/disklabel.h>
+#include <sys/dkio.h>
#include <dev/ata/atareg.h>
#include <dev/ic/wdcreg.h>
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 819d333c80b..9be8f2eb041 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wd.c,v 1.79 2010/04/23 15:25:21 jsing Exp $ */
+/* $OpenBSD: wd.c,v 1.80 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
/*
@@ -79,6 +79,7 @@
#include <sys/syslog.h>
#include <sys/proc.h>
#include <sys/vnode.h>
+#include <sys/dkio.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 657f642d0d6..cc628f78239 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ccd.c,v 1.89 2010/04/23 15:25:21 jsing Exp $ */
+/* $OpenBSD: ccd.c,v 1.90 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: ccd.c,v 1.33 1996/05/05 04:21:14 thorpej Exp $ */
/*-
@@ -103,6 +103,7 @@
#include <sys/vnode.h>
#include <sys/conf.h>
#include <sys/rwlock.h>
+#include <sys/dkio.h>
#include <dev/ccdvar.h>
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index a7a5f69dbd5..1fac90cbff9 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.84 2010/04/23 15:25:21 jsing Exp $ */
+/* $OpenBSD: fd.c,v 1.85 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */
/*-
@@ -60,6 +60,7 @@
#include <sys/queue.h>
#include <sys/stat.h>
#include <sys/timeout.h>
+#include <sys/dkio.h>
#include <machine/cpu.h>
#include <machine/bus.h>
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 0249c3ae580..c56e4b03924 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.201 2010/03/28 16:38:57 jsing Exp $ */
+/* $OpenBSD: softraid.c,v 1.202 2010/05/18 04:41:14 dlg Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -40,6 +40,7 @@
#include <sys/uio.h>
#include <sys/workq.h>
#include <sys/kthread.h>
+#include <sys/dkio.h>
#ifdef AOE
#include <sys/mbuf.h>
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c
index 970584f54f4..6cf972097e5 100644
--- a/sys/dev/softraid_crypto.c
+++ b/sys/dev/softraid_crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_crypto.c,v 1.51 2010/04/18 16:57:48 jsing Exp $ */
+/* $OpenBSD: softraid_crypto.c,v 1.52 2010/05/18 04:41:14 dlg Exp $ */
/*
* Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org>
@@ -39,6 +39,7 @@
#include <sys/stat.h>
#include <sys/conf.h>
#include <sys/uio.h>
+#include <sys/dkio.h>
#include <crypto/cryptodev.h>
#include <crypto/cryptosoft.h>
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 04d241f8a6f..ccbfe20a009 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vnd.c,v 1.96 2010/04/23 15:25:21 jsing Exp $ */
+/* $OpenBSD: vnd.c,v 1.97 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $ */
/*
@@ -79,6 +79,7 @@
#include <sys/rwlock.h>
#include <sys/uio.h>
#include <sys/conf.h>
+#include <sys/dkio.h>
#include <crypto/blf.h>
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index 6ad6852f29f..c1816c58186 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spec_vnops.c,v 1.56 2009/08/13 15:00:14 jasper Exp $ */
+/* $OpenBSD: spec_vnops.c,v 1.57 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */
/*
@@ -48,6 +48,7 @@
#include <sys/disklabel.h>
#include <sys/lockf.h>
#include <sys/poll.h>
+#include <sys/dkio.h>
#include <miscfs/specfs/specdev.h>
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 6ad6852f29f..c1816c58186 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spec_vnops.c,v 1.56 2009/08/13 15:00:14 jasper Exp $ */
+/* $OpenBSD: spec_vnops.c,v 1.57 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */
/*
@@ -48,6 +48,7 @@
#include <sys/disklabel.h>
#include <sys/lockf.h>
#include <sys/poll.h>
+#include <sys/dkio.h>
#include <miscfs/specfs/specdev.h>
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index bb876022113..46b6d3b29e9 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.c,v 1.166 2010/04/23 15:25:21 jsing Exp $ */
+/* $OpenBSD: cd.c,v 1.167 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */
/*
@@ -66,6 +66,7 @@
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/scsiio.h>
+#include <sys/dkio.h>
#include <sys/vnode.h>
#include <scsi/scsi_all.h>
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index eae018767c4..f6501f207ec 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.186 2010/04/30 02:17:06 dlg Exp $ */
+/* $OpenBSD: sd.c,v 1.187 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */
/*-
@@ -65,6 +65,7 @@
#include <sys/proc.h>
#include <sys/conf.h>
#include <sys/scsiio.h>
+#include <sys/dkio.h>
#include <scsi/scsi_all.h>
#include <scsi/scsi_disk.h>
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index 9283e2e243f..96fb7afd14e 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioctl.h,v 1.8 2003/06/02 23:28:21 millert Exp $ */
+/* $OpenBSD: ioctl.h,v 1.9 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: ioctl.h,v 1.20 1996/01/30 18:21:47 thorpej Exp $ */
/*-
@@ -58,7 +58,6 @@ struct ttysize {
#include <sys/ioccom.h>
-#include <sys/dkio.h>
#include <sys/filio.h>
#include <sys/sockio.h>
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index f75ad09be2c..2babcfad0ac 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_vfsops.c,v 1.54 2009/10/31 12:00:08 fgsch Exp $ */
+/* $OpenBSD: ext2fs_vfsops.c,v 1.55 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $ */
/*
@@ -52,6 +52,7 @@
#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/lock.h>
+#include <sys/dkio.h>
#include <miscfs/specfs/specdev.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 1f331380576..339eb2fad4f 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_vfsops.c,v 1.121 2009/12/19 00:27:17 krw Exp $ */
+/* $OpenBSD: ffs_vfsops.c,v 1.122 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */
/*
@@ -49,6 +49,7 @@
#include <sys/malloc.h>
#include <sys/sysctl.h>
#include <sys/pool.h>
+#include <sys/dkio.h>
#include <dev/rndvar.h>
diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c
index a35a6b47770..92e80bd4b31 100644
--- a/sys/uvm/uvm_vnode.c
+++ b/sys/uvm/uvm_vnode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_vnode.c,v 1.70 2010/04/30 21:56:39 oga Exp $ */
+/* $OpenBSD: uvm_vnode.c,v 1.71 2010/05/18 04:41:14 dlg Exp $ */
/* $NetBSD: uvm_vnode.c,v 1.36 2000/11/24 20:34:01 chs Exp $ */
/*
@@ -60,6 +60,7 @@
#include <sys/fcntl.h>
#include <sys/conf.h>
#include <sys/rwlock.h>
+#include <sys/dkio.h>
#include <miscfs/specfs/specdev.h>