From a84e173e22bf0ea7d3d281a3cb30d0064312742f Mon Sep 17 00:00:00 2001 From: Alex Hornung Date: Thu, 2 Dec 2010 11:03:11 +0000 Subject: [PATCH] dm - undo my pointless moving of dm.h * There was no need to move dm.h, we can just use . * 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 --- Makefile_upgrade.inc | 2 +- sys/dev/disk/dm/device-mapper.c | 2 +- sys/{sys => dev/disk/dm}/dm.h | 0 sys/dev/disk/dm/dm_dev.c | 2 +- sys/dev/disk/dm/dm_ioctl.c | 2 +- sys/dev/disk/dm/dm_pdev.c | 2 +- sys/dev/disk/dm/dm_table.c | 2 +- sys/dev/disk/dm/dm_target.c | 2 +- sys/dev/disk/dm/dm_target_error.c | 2 +- sys/dev/disk/dm/dm_target_zero.c | 2 +- sys/dev/disk/dm/targets/crypt/Makefile | 3 --- sys/dev/disk/dm/targets/crypt/dm_target_crypt.c | 2 +- sys/dev/disk/dm/targets/dmirror/Makefile | 3 --- sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c | 2 +- sys/dev/disk/dm/targets/linear/Makefile | 3 --- sys/dev/disk/dm/targets/linear/dm_target_linear.c | 2 +- sys/dev/disk/dm/targets/striped/Makefile | 3 --- sys/dev/disk/dm/targets/striped/dm_target_striped.c | 2 +- 18 files changed, 13 insertions(+), 25 deletions(-) rename sys/{sys => dev/disk/dm}/dm.h (100%) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 136a1e225b..b3014b507f 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -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 diff --git a/sys/dev/disk/dm/device-mapper.c b/sys/dev/disk/dm/device-mapper.c index 5ee46f4335..bae26df476 100644 --- a/sys/dev/disk/dm/device-mapper.c +++ b/sys/dev/disk/dm/device-mapper.c @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include "netbsd-dm.h" diff --git a/sys/sys/dm.h b/sys/dev/disk/dm/dm.h similarity index 100% rename from sys/sys/dm.h rename to sys/dev/disk/dm/dm.h diff --git a/sys/dev/disk/dm/dm_dev.c b/sys/dev/disk/dm/dm_dev.c index 6031fe9c3e..7f0afffc95 100644 --- a/sys/dev/disk/dm/dm_dev.c +++ b/sys/dev/disk/dm/dm_dev.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "netbsd-dm.h" diff --git a/sys/dev/disk/dm/dm_ioctl.c b/sys/dev/disk/dm/dm_ioctl.c index 612fd44789..6376f1c2ed 100644 --- a/sys/dev/disk/dm/dm_ioctl.c +++ b/sys/dev/disk/dm/dm_ioctl.c @@ -89,7 +89,7 @@ #include #include #include -#include +#include #include "netbsd-dm.h" diff --git a/sys/dev/disk/dm/dm_pdev.c b/sys/dev/disk/dm/dm_pdev.c index 063e8f547f..934c2d6e82 100644 --- a/sys/dev/disk/dm/dm_pdev.c +++ b/sys/dev/disk/dm/dm_pdev.c @@ -39,7 +39,7 @@ #include #include -#include +#include SLIST_HEAD(dm_pdevs, dm_pdev) dm_pdev_list; diff --git a/sys/dev/disk/dm/dm_table.c b/sys/dev/disk/dm/dm_table.c index a6fd3c1f31..3df7ae36c3 100644 --- a/sys/dev/disk/dm/dm_table.c +++ b/sys/dev/disk/dm/dm_table.c @@ -34,7 +34,7 @@ #include -#include +#include /* * There are two types of users of this interface: diff --git a/sys/dev/disk/dm/dm_target.c b/sys/dev/disk/dm/dm_target.c index 88c36c4af4..087bd73b6e 100644 --- a/sys/dev/disk/dm/dm_target.c +++ b/sys/dev/disk/dm/dm_target.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "netbsd-dm.h" diff --git a/sys/dev/disk/dm/dm_target_error.c b/sys/dev/disk/dm/dm_target_error.c index 2b875ba4e5..8926c4197c 100644 --- a/sys/dev/disk/dm/dm_target_error.c +++ b/sys/dev/disk/dm/dm_target_error.c @@ -37,7 +37,7 @@ #include -#include +#include /* Init function called from dm_table_load_ioctl. */ static int diff --git a/sys/dev/disk/dm/dm_target_zero.c b/sys/dev/disk/dm/dm_target_zero.c index 484d9d3d79..f6d72b5760 100644 --- a/sys/dev/disk/dm/dm_target_zero.c +++ b/sys/dev/disk/dm/dm_target_zero.c @@ -38,7 +38,7 @@ #include -#include +#include /* * Zero target init function. This target doesn't need diff --git a/sys/dev/disk/dm/targets/crypt/Makefile b/sys/dev/disk/dm/targets/crypt/Makefile index df5f1af937..41b60f12fa 100644 --- a/sys/dev/disk/dm/targets/crypt/Makefile +++ b/sys/dev/disk/dm/targets/crypt/Makefile @@ -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 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 abe4725e2f..0c5bdfb8b5 100644 --- a/sys/dev/disk/dm/targets/crypt/dm_target_crypt.c +++ b/sys/dev/disk/dm/targets/crypt/dm_target_crypt.c @@ -54,7 +54,7 @@ #include #include -#include +#include MALLOC_DEFINE(M_DMCRYPT, "dm_crypt", "Device Mapper Target Crypt"); struct target_crypt_config; diff --git a/sys/dev/disk/dm/targets/dmirror/Makefile b/sys/dev/disk/dm/targets/dmirror/Makefile index bcf89ea18f..5481ec9fe7 100644 --- a/sys/dev/disk/dm/targets/dmirror/Makefile +++ b/sys/dev/disk/dm/targets/dmirror/Makefile @@ -1,8 +1,5 @@ -DM_PATH= ${.CURDIR}/../../ - KMOD= dm_target_dmirror SRCS+= dm_target_dmirror.c -CFLAGS+=-I${DM_PATH} .include 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 4d719670ae..04f2c0e9ef 100644 --- a/sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c +++ b/sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c @@ -44,7 +44,7 @@ #include #include -#include +#include MALLOC_DEFINE(M_DMDMIRROR, "dm_dmirror", "Device Mapper Target DMIRROR"); /* segdesc flags */ diff --git a/sys/dev/disk/dm/targets/linear/Makefile b/sys/dev/disk/dm/targets/linear/Makefile index 98031b5e7e..270cd0d3c8 100644 --- a/sys/dev/disk/dm/targets/linear/Makefile +++ b/sys/dev/disk/dm/targets/linear/Makefile @@ -1,8 +1,5 @@ -DM_PATH= ${.CURDIR}/../../ - KMOD= dm_target_linear SRCS+= dm_target_linear.c -CFLAGS+=-I${DM_PATH} .include 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 310fab2d4e..5735f60043 100644 --- a/sys/dev/disk/dm/targets/linear/dm_target_linear.c +++ b/sys/dev/disk/dm/targets/linear/dm_target_linear.c @@ -42,7 +42,7 @@ #include #include -#include +#include MALLOC_DEFINE(M_DMLINEAR, "dm_linear", "Device Mapper Target Linear"); /* diff --git a/sys/dev/disk/dm/targets/striped/Makefile b/sys/dev/disk/dm/targets/striped/Makefile index d3db6d3538..4b97d09e75 100644 --- a/sys/dev/disk/dm/targets/striped/Makefile +++ b/sys/dev/disk/dm/targets/striped/Makefile @@ -1,8 +1,5 @@ -DM_PATH= ${.CURDIR}/../../ - KMOD= dm_target_striped SRCS+= dm_target_striped.c -CFLAGS+=-I${DM_PATH} .include 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 4d18051e92..9162c31d36 100644 --- a/sys/dev/disk/dm/targets/striped/dm_target_striped.c +++ b/sys/dev/disk/dm/targets/striped/dm_target_striped.c @@ -44,7 +44,7 @@ #include #include -#include +#include MALLOC_DEFINE(M_DMSTRIPE, "dm_stripe", "Device Mapper Target Stripe"); static void dm_target_stripe_destroy_config(dm_target_stripe_config_t *tsc); -- 2.41.0