dm - undo my pointless moving of dm.h
authorAlex Hornung <ahornung@gmail.com>
Thu, 2 Dec 2010 11:03:11 +0000 (11:03 +0000)
committerAlex Hornung <ahornung@gmail.com>
Thu, 2 Dec 2010 11:39:35 +0000 (11:39 +0000)
* There was no need to move dm.h, we can just use <dev/disk/dm/dm.h>.

* And since we can do the above, we can also get rid of the strange
  Makefile CFLAGS magic I added.

* Also undo the removal on upgrade of /usr/include/dev/disk/dm/dm.h and
  instead remove sys/dm.h

Reported-by: Sascha Wildner
18 files changed:
Makefile_upgrade.inc
sys/dev/disk/dm/device-mapper.c
sys/dev/disk/dm/dm.h [moved from sys/sys/dm.h with 100% similarity]
sys/dev/disk/dm/dm_dev.c
sys/dev/disk/dm/dm_ioctl.c
sys/dev/disk/dm/dm_pdev.c
sys/dev/disk/dm/dm_table.c
sys/dev/disk/dm/dm_target.c
sys/dev/disk/dm/dm_target_error.c
sys/dev/disk/dm/dm_target_zero.c
sys/dev/disk/dm/targets/crypt/Makefile
sys/dev/disk/dm/targets/crypt/dm_target_crypt.c
sys/dev/disk/dm/targets/dmirror/Makefile
sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c
sys/dev/disk/dm/targets/linear/Makefile
sys/dev/disk/dm/targets/linear/dm_target_linear.c
sys/dev/disk/dm/targets/striped/Makefile
sys/dev/disk/dm/targets/striped/dm_target_striped.c

index 136a1e2..b3014b5 100644 (file)
@@ -1545,7 +1545,7 @@ TO_REMOVE+=/boot/kernel/hotplug.ko
 TO_REMOVE+=/usr/include/sys/hotplug.h
 TO_REMOVE+=/usr/share/man/cat4/hotplug.4.gz
 TO_REMOVE+=/usr/share/man/man4/hotplug.4.gz
-TO_REMOVE+=/usr/include/dev/disk/dm/dm.h
+TO_REMOVE+=/usr/include/sys/dm.h
 
 # XXX Remove when adjusted to the new 802.11 framework
 TO_REMOVE+=/boot/modules/if_acx.ko
index 5ee46f4..bae26df 100644 (file)
@@ -47,7 +47,7 @@
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/sysctl.h>
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 
 #include "netbsd-dm.h"
 
similarity index 100%
rename from sys/sys/dm.h
rename to sys/dev/disk/dm/dm.h
index 6031fe9..7f0afff 100644 (file)
@@ -36,7 +36,7 @@
 #include <sys/disklabel.h>
 #include <sys/ioccom.h>
 #include <sys/malloc.h>
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 
 #include "netbsd-dm.h"
 
index 612fd44..6376f1c 100644 (file)
@@ -89,7 +89,7 @@
 #include <sys/malloc.h>
 #include <sys/udev.h>
 #include <sys/vnode.h>
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 
 #include "netbsd-dm.h"
 
index 063e8f5..934c2d6 100644 (file)
@@ -39,7 +39,7 @@
 #include <sys/vnode.h>
 #include <sys/nlookup.h>
 
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 
 SLIST_HEAD(dm_pdevs, dm_pdev) dm_pdev_list;
 
index a6fd3c1..3df7ae3 100644 (file)
@@ -34,7 +34,7 @@
 
 #include <sys/malloc.h>
 
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 
 /*
  * There are two types of users of this interface:
index 88c36c4..087bd73 100644 (file)
@@ -35,7 +35,7 @@
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/linker.h>
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 
 #include "netbsd-dm.h"
 
index 2b875ba..8926c41 100644 (file)
@@ -37,7 +37,7 @@
 
 #include <sys/buf.h>
 
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 
 /* Init function called from dm_table_load_ioctl. */
 static int
index 484d9d3..f6d72b5 100644 (file)
@@ -38,7 +38,7 @@
 
 #include <sys/buf.h>
 
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 
 /*
  * Zero target init function. This target doesn't need
index df5f1af..41b60f1 100644 (file)
@@ -1,9 +1,6 @@
-DM_PATH=       ${.CURDIR}/../../
-
 KMOD=   dm_target_crypt
 
 SRCS+= bus_if.h device_if.h
 SRCS+= dm_target_crypt.c
-CFLAGS+=-I${DM_PATH}
 
 .include <bsd.kmod.mk>
index abe4725..0c5bdfb 100644 (file)
@@ -54,7 +54,7 @@
 #include <opencrypto/rmd160.h>
 #include <machine/cpufunc.h>
 
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 MALLOC_DEFINE(M_DMCRYPT, "dm_crypt", "Device Mapper Target Crypt");
 
 struct target_crypt_config;
index bcf89ea..5481ec9 100644 (file)
@@ -1,8 +1,5 @@
-DM_PATH=       ${.CURDIR}/../../
-
 KMOD=   dm_target_dmirror
 
 SRCS+= dm_target_dmirror.c
-CFLAGS+=-I${DM_PATH}
 
 .include <bsd.kmod.mk>
index 4d71967..04f2c0e 100644 (file)
@@ -44,7 +44,7 @@
 #include <sys/uuid.h>
 #include <sys/vnode.h>
 
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 MALLOC_DEFINE(M_DMDMIRROR, "dm_dmirror", "Device Mapper Target DMIRROR");
 
 /* segdesc flags */
index 98031b5..270cd0d 100644 (file)
@@ -1,8 +1,5 @@
-DM_PATH=       ${.CURDIR}/../../
-
 KMOD=   dm_target_linear
 
 SRCS+= dm_target_linear.c
-CFLAGS+=-I${DM_PATH}
 
 .include <bsd.kmod.mk>
index 310fab2..5735f60 100644 (file)
@@ -42,7 +42,7 @@
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 MALLOC_DEFINE(M_DMLINEAR, "dm_linear", "Device Mapper Target Linear");
 
 /*
index d3db6d3..4b97d09 100644 (file)
@@ -1,8 +1,5 @@
-DM_PATH=       ${.CURDIR}/../../
-
 KMOD=   dm_target_striped
 
 SRCS+= dm_target_striped.c
-CFLAGS+=-I${DM_PATH}
 
 .include <bsd.kmod.mk>
index 4d18051..9162c31 100644 (file)
@@ -44,7 +44,7 @@
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 
-#include <sys/dm.h>
+#include <dev/disk/dm/dm.h>
 MALLOC_DEFINE(M_DMSTRIPE, "dm_stripe", "Device Mapper Target Stripe");
 
 static void dm_target_stripe_destroy_config(dm_target_stripe_config_t *tsc);