From c8e73ea203dc8297237463e8703f5beaa554eb87 Mon Sep 17 00:00:00 2001
From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Thu, 19 Nov 2015 21:22:22 +0900
Subject: [PATCH] sys/dev/disk/dm: Cleanup header includes

dm.h depends on <sys/vnode.h>, so dm.h should include it
instead of having c files that depend on dm.h include it.
---
 sys/dev/disk/dm/dm.h                                  | 1 +
 sys/dev/disk/dm/dm_ioctl.c                            | 1 -
 sys/dev/disk/dm/dm_pdev.c                             | 1 -
 sys/dev/disk/dm/targets/crypt/dm_target_crypt.c       | 1 -
 sys/dev/disk/dm/targets/delay/dm_target_delay.c       | 1 -
 sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c   | 1 -
 sys/dev/disk/dm/targets/linear/dm_target_linear.c     | 1 -
 sys/dev/disk/dm/targets/snapshot/dm_target_snapshot.c | 1 -
 sys/dev/disk/dm/targets/striped/dm_target_striped.c   | 1 -
 9 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/sys/dev/disk/dm/dm.h b/sys/dev/disk/dm/dm.h
index adc7cd3de0..1c49f36786 100644
--- a/sys/dev/disk/dm/dm.h
+++ b/sys/dev/disk/dm/dm.h
@@ -44,6 +44,7 @@
 #include <sys/lock.h>
 #include <sys/queue.h>
 
+#include <sys/vnode.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/devicestat.h>
diff --git a/sys/dev/disk/dm/dm_ioctl.c b/sys/dev/disk/dm/dm_ioctl.c
index f3ee6022b2..4b42288305 100644
--- a/sys/dev/disk/dm/dm_ioctl.c
+++ b/sys/dev/disk/dm/dm_ioctl.c
@@ -81,7 +81,6 @@
 
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/vnode.h>
 #include <cpu/atomic.h>
 #include <dev/disk/dm/dm.h>
 #include <dev/disk/dm/netbsd-dm.h>
diff --git a/sys/dev/disk/dm/dm_pdev.c b/sys/dev/disk/dm/dm_pdev.c
index c6e8ef5f68..5dfd7a01d6 100644
--- a/sys/dev/disk/dm/dm_pdev.c
+++ b/sys/dev/disk/dm/dm_pdev.c
@@ -34,7 +34,6 @@
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/namei.h>
-#include <sys/vnode.h>
 #include <sys/nlookup.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 5de0563c93..8536465364 100644
--- a/sys/dev/disk/dm/targets/crypt/dm_target_crypt.c
+++ b/sys/dev/disk/dm/targets/crypt/dm_target_crypt.c
@@ -44,7 +44,6 @@
 #include <sys/mpipe.h>
 #include <sys/md5.h>
 #include <sys/mutex2.h>
-#include <sys/vnode.h>
 #include <crypto/sha1.h>
 #include <crypto/sha2/sha2.h>
 #include <opencrypto/cryptodev.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 e2672e9f5d..ba72422b30 100644
--- a/sys/dev/disk/dm/targets/delay/dm_target_delay.c
+++ b/sys/dev/disk/dm/targets/delay/dm_target_delay.c
@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/vnode.h>
 #include <sys/mutex2.h>
 #include <sys/objcache.h>
 #include <sys/callout.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 303745d3ec..2367cfcedf 100644
--- a/sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c
+++ b/sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c
@@ -38,7 +38,6 @@
 #include <sys/bio.h>
 #include <sys/malloc.h>
 #include <sys/uuid.h>
-#include <sys/vnode.h>
 
 #include <dev/disk/dm/dm.h>
 MALLOC_DEFINE(M_DMDMIRROR, "dm_dmirror", "Device Mapper Target DMIRROR");
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 86ec155dd1..04f3d5ad07 100644
--- a/sys/dev/disk/dm/targets/linear/dm_target_linear.c
+++ b/sys/dev/disk/dm/targets/linear/dm_target_linear.c
@@ -35,7 +35,6 @@
  */
 
 #include <sys/malloc.h>
-#include <sys/vnode.h>
 
 #include <dev/disk/dm/dm.h>
 MALLOC_DEFINE(M_DMLINEAR, "dm_linear", "Device Mapper Target Linear");
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 d7429c8021..a4a1f78fa3 100644
--- a/sys/dev/disk/dm/targets/snapshot/dm_target_snapshot.c
+++ b/sys/dev/disk/dm/targets/snapshot/dm_target_snapshot.c
@@ -77,7 +77,6 @@
  * This file implements initial version of device-mapper snapshot target.
  */
 #include <sys/kmem.h>
-#include <sys/vnode.h>
 
 #include <dev/disk/dm/dm.h>
 
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 9648fc1d13..3e6c36b26c 100644
--- a/sys/dev/disk/dm/targets/striped/dm_target_striped.c
+++ b/sys/dev/disk/dm/targets/striped/dm_target_striped.c
@@ -38,7 +38,6 @@
  * DragonFly changes: Increase to an unlimited number of stripes
  */
 #include <sys/malloc.h>
-#include <sys/vnode.h>
 
 #include <dev/disk/dm/dm.h>
 MALLOC_DEFINE(M_DMSTRIPE, "dm_striped", "Device Mapper Target Striped");
-- 
2.41.0