sys/dev/disk/dm: Cleanup header includes

diff --git a/sys/dev/disk/dm/device-mapper.c b/sys/dev/disk/dm/device-mapper.c
index eedbf3e..bbf5a6b 100644 (file)
--- a/sys/dev/disk/dm/device-mapper.c
+++ b/sys/dev/disk/dm/device-mapper.c
@@ -34,9 +34,7 @@
  * I want to say thank you to all people who helped me with this project.
  */
 
-#include <sys/types.h>
 #include <sys/ctype.h>
-#include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disk.h>
@@ -46,8 +44,7 @@
 #include <sys/module.h>
 #include <sys/sysctl.h>
 #include <dev/disk/dm/dm.h>
-
-#include "netbsd-dm.h"
+#include <dev/disk/dm/netbsd-dm.h>
 
 static d_ioctl_t       dmioctl;
 static d_open_t        dmopen;

diff --git a/sys/dev/disk/dm/dm.h b/sys/dev/disk/dm/dm.h
index d5c6de5..adc7cd3 100644 (file)
--- a/sys/dev/disk/dm/dm.h
+++ b/sys/dev/disk/dm/dm.h
@@ -38,8 +38,8 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 
+#include <sys/types.h>
 #include <cpu/inttypes.h>
-#include <cpu/atomic.h>
 #include <sys/condvar.h>
 #include <sys/lock.h>
 #include <sys/queue.h>

diff --git a/sys/dev/disk/dm/dm_dev.c b/sys/dev/disk/dm/dm_dev.c
index 3e5c065..c6c59bb 100644 (file)
--- a/sys/dev/disk/dm/dm_dev.c
+++ b/sys/dev/disk/dm/dm_dev.c
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>
-#include <machine/thread.h>
 #include <sys/thread2.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
@@ -40,9 +38,9 @@
 #include <sys/udev.h>
 #include <sys/devfs.h>
 #include <sys/malloc.h>
+#include <machine/thread.h>
 #include <dev/disk/dm/dm.h>
-
-#include "netbsd-dm.h"
+#include <dev/disk/dm/netbsd-dm.h>
 
 extern struct dev_ops dm_ops;
 

diff --git a/sys/dev/disk/dm/dm_ioctl.c b/sys/dev/disk/dm/dm_ioctl.c
index 0872e8f..f3ee602 100644 (file)
--- a/sys/dev/disk/dm/dm_ioctl.c
+++ b/sys/dev/disk/dm/dm_ioctl.c
@@ -79,13 +79,12 @@
  *
  */
 
-#include <sys/types.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
+#include <cpu/atomic.h>
 #include <dev/disk/dm/dm.h>
-
-#include "netbsd-dm.h"
+#include <dev/disk/dm/netbsd-dm.h>
 
 static int
 dm_table_deps(dm_table_entry_t *, prop_array_t);

diff --git a/sys/dev/disk/dm/dm_pdev.c b/sys/dev/disk/dm/dm_pdev.c
index 6984775..c6e8ef5 100644 (file)
--- a/sys/dev/disk/dm/dm_pdev.c
+++ b/sys/dev/disk/dm/dm_pdev.c
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
 #include <sys/disk.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>

diff --git a/sys/dev/disk/dm/dm_table.c b/sys/dev/disk/dm/dm_table.c
index 58a1c47..2f13e3c 100644 (file)
--- a/sys/dev/disk/dm/dm_table.c
+++ b/sys/dev/disk/dm/dm_table.c
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
 #include <sys/malloc.h>
+#include <cpu/atomic.h>
 #include <dev/disk/dm/dm.h>
 
 /*

diff --git a/sys/dev/disk/dm/dm_target.c b/sys/dev/disk/dm/dm_target.c
index 4c0b039..01a5d1b 100644 (file)
--- a/sys/dev/disk/dm/dm_target.c
+++ b/sys/dev/disk/dm/dm_target.c
@@ -30,13 +30,12 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/linker.h>
+#include <cpu/atomic.h>
 #include <dev/disk/dm/dm.h>
-
-#include "netbsd-dm.h"
+#include <dev/disk/dm/netbsd-dm.h>
 
 static dm_target_t *dm_target_lookup_name(const char *);
 

diff --git a/sys/dev/disk/dm/dm_target_error.c b/sys/dev/disk/dm/dm_target_error.c
index 767bdb0..3bf56e1 100644 (file)
--- a/sys/dev/disk/dm/dm_target_error.c
+++ b/sys/dev/disk/dm/dm_target_error.c
@@ -32,8 +32,6 @@
 /*
  * This file implements initial version of device-mapper error target.
  */
-#include <sys/types.h>
-#include <sys/buf.h>
 #include <dev/disk/dm/dm.h>
 
 /* Init function called from dm_table_load_ioctl. */

diff --git a/sys/dev/disk/dm/dm_target_zero.c b/sys/dev/disk/dm/dm_target_zero.c
index db707bd..5251fd6 100644 (file)
--- a/sys/dev/disk/dm/dm_target_zero.c
+++ b/sys/dev/disk/dm/dm_target_zero.c
@@ -32,8 +32,6 @@
 /*
  * This file implements initial version of device-mapper zero target.
  */
-#include <sys/types.h>
-#include <sys/buf.h>
 #include <dev/disk/dm/dm.h>
 
 /*

diff --git a/sys/dev/disk/dm/targets/crypt/dm_target_crypt.c b/sys/dev/disk/dm/targets/crypt/dm_target_crypt.c
index 75468c1..5de0563 100644 (file)
--- a/sys/dev/disk/dm/targets/crypt/dm_target_crypt.c
+++ b/sys/dev/disk/dm/targets/crypt/dm_target_crypt.c
@@ -35,11 +35,9 @@
 /*
  * This file implements initial version of device-mapper crypt target.
  */
-#include <sys/types.h>
 #include <sys/endian.h>
 
 #include <sys/bio.h>
-#include <sys/buf.h>
 #include <sys/globaldata.h>
 #include <sys/kerneldump.h>
 #include <sys/malloc.h>
@@ -52,6 +50,7 @@
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/rmd160.h>
 #include <machine/cpufunc.h>
+#include <cpu/atomic.h>
 
 #include <sys/ktr.h>
 

diff --git a/sys/dev/disk/dm/targets/delay/dm_target_delay.c b/sys/dev/disk/dm/targets/delay/dm_target_delay.c
index 06e9497..919875d 100644 (file)
--- a/sys/dev/disk/dm/targets/delay/dm_target_delay.c
+++ b/sys/dev/disk/dm/targets/delay/dm_target_delay.c
@@ -32,8 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-#include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/mutex2.h>
 #include <sys/objcache.h>

diff --git a/sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c b/sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c
index 7e9c813..303745d 100644 (file)
--- a/sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c
+++ b/sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c
@@ -35,11 +35,7 @@
 /*
  * This file implements initial version of a mirror target
  */
-#include <sys/types.h>
-#include <sys/param.h>
-
 #include <sys/bio.h>
-#include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/uuid.h>
 #include <sys/vnode.h>

diff --git a/sys/dev/disk/dm/targets/linear/dm_target_linear.c b/sys/dev/disk/dm/targets/linear/dm_target_linear.c
index eaeffa9..86ec155 100644 (file)
--- a/sys/dev/disk/dm/targets/linear/dm_target_linear.c
+++ b/sys/dev/disk/dm/targets/linear/dm_target_linear.c
@@ -34,9 +34,6 @@
  * This file implements initial version of device-mapper dklinear target.
  */
 
-#include <sys/types.h>
-
-#include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 

diff --git a/sys/dev/disk/dm/targets/mirror/dm_target_mirror.c b/sys/dev/disk/dm/targets/mirror/dm_target_mirror.c
index e6ad94e..9c50625 100644 (file)
--- a/sys/dev/disk/dm/targets/mirror/dm_target_mirror.c
+++ b/sys/dev/disk/dm/targets/mirror/dm_target_mirror.c
@@ -32,12 +32,7 @@
 /*
  * This file implements initial version of device-mapper mirror target.
  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <sys/buf.h>
-
-#include "dm.h"
+#include <dev/disk/dm/dm.h>
 
 typedef struct target_mirror_config {
 #define MAX_MIRROR_COPIES 4

diff --git a/sys/dev/disk/dm/targets/snapshot/dm_target_snapshot.c b/sys/dev/disk/dm/targets/snapshot/dm_target_snapshot.c
index 8c20244..d7429c8 100644 (file)
--- a/sys/dev/disk/dm/targets/snapshot/dm_target_snapshot.c
+++ b/sys/dev/disk/dm/targets/snapshot/dm_target_snapshot.c
@@ -76,14 +76,10 @@
 /*
  * This file implements initial version of device-mapper snapshot target.
  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <sys/buf.h>
 #include <sys/kmem.h>
 #include <sys/vnode.h>
 
-#include "dm.h"
+#include <dev/disk/dm/dm.h>
 
 typedef struct target_snapshot_config {
        dm_pdev_t *tsc_snap_dev;

diff --git a/sys/dev/disk/dm/targets/striped/dm_target_striped.c b/sys/dev/disk/dm/targets/striped/dm_target_striped.c
index b1b3cdf..fa79521 100644 (file)
--- a/sys/dev/disk/dm/targets/striped/dm_target_striped.c
+++ b/sys/dev/disk/dm/targets/striped/dm_target_striped.c
@@ -37,9 +37,6 @@
  *
  * DragonFly changes: Increase to an unlimited number of stripes
  */
-#include <sys/types.h>
-
-#include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>