sys/dev/disk/dm: Remove dm/targets/ directory and move its entries to dm/
authorTomohiro Kusumi <kusumi.tomohiro@gmail.com>
Sat, 26 Nov 2016 03:46:41 +0000 (12:46 +0900)
committerTomohiro Kusumi <kusumi.tomohiro@gmail.com>
Sat, 26 Nov 2016 15:52:41 +0000 (00:52 +0900)
Device mapper targets' path
sys/dev/disk/dm/targets/<name>/dm_target_<name>.c
are too deep for no reason.

This commit removes targets/ directory which isn't necessary at all,
assuming userspace has no dependencies on this (and it shouldn't either).

Neither NetBSD (sys/dev/dm/dm_target_*.c) nor Linux kernel (drivers/md/dm*.c)
has a directory tree like this, which is better.

18 files changed:
sys/conf/files
sys/dev/disk/dm/Makefile
sys/dev/disk/dm/crypt/Makefile [moved from sys/dev/disk/dm/targets/crypt/Makefile with 100% similarity]
sys/dev/disk/dm/crypt/dm_target_crypt.c [moved from sys/dev/disk/dm/targets/crypt/dm_target_crypt.c with 100% similarity]
sys/dev/disk/dm/delay/Makefile [moved from sys/dev/disk/dm/targets/delay/Makefile with 100% similarity]
sys/dev/disk/dm/delay/dm_target_delay.c [moved from sys/dev/disk/dm/targets/delay/dm_target_delay.c with 100% similarity]
sys/dev/disk/dm/dmirror/Makefile [moved from sys/dev/disk/dm/targets/dmirror/Makefile with 100% similarity]
sys/dev/disk/dm/dmirror/dm_target_dmirror.c [moved from sys/dev/disk/dm/targets/dmirror/dm_target_dmirror.c with 100% similarity]
sys/dev/disk/dm/dmirror/dmirror_notes.txt [moved from sys/dev/disk/dm/targets/dmirror/dmirror_notes.txt with 100% similarity]
sys/dev/disk/dm/flakey/Makefile [moved from sys/dev/disk/dm/targets/flakey/Makefile with 100% similarity]
sys/dev/disk/dm/flakey/dm_target_flakey.c [moved from sys/dev/disk/dm/targets/flakey/dm_target_flakey.c with 100% similarity]
sys/dev/disk/dm/linear/Makefile [moved from sys/dev/disk/dm/targets/linear/Makefile with 100% similarity]
sys/dev/disk/dm/linear/dm_target_linear.c [moved from sys/dev/disk/dm/targets/linear/dm_target_linear.c with 100% similarity]
sys/dev/disk/dm/mirror/dm_target_mirror.c [moved from sys/dev/disk/dm/targets/mirror/dm_target_mirror.c with 100% similarity]
sys/dev/disk/dm/snapshot/dm_target_snapshot.c [moved from sys/dev/disk/dm/targets/snapshot/dm_target_snapshot.c with 100% similarity]
sys/dev/disk/dm/striped/Makefile [moved from sys/dev/disk/dm/targets/striped/Makefile with 100% similarity]
sys/dev/disk/dm/striped/dm_target_striped.c [moved from sys/dev/disk/dm/targets/striped/dm_target_striped.c with 100% similarity]
sys/dev/disk/dm/targets/Makefile [deleted file]

index 23b3908..5816f26 100644 (file)
@@ -85,11 +85,11 @@ dev/disk/dm/dm_table.c                      optional dm
 dev/disk/dm/dm_target.c                        optional dm
 dev/disk/dm/dm_target_error.c          optional dm
 dev/disk/dm/dm_target_zero.c           optional dm
-dev/disk/dm/targets/crypt/dm_target_crypt.c    optional dm_target_crypt
-dev/disk/dm/targets/linear/dm_target_linear.c  optional dm_target_linear
-dev/disk/dm/targets/striped/dm_target_striped.c        optional dm_target_striped
-dev/disk/dm/targets/delay/dm_target_delay.c    optional dm_target_delay
-dev/disk/dm/targets/flakey/dm_target_flakey.c  optional dm_target_flakey
+dev/disk/dm/crypt/dm_target_crypt.c    optional dm_target_crypt
+dev/disk/dm/linear/dm_target_linear.c  optional dm_target_linear
+dev/disk/dm/striped/dm_target_striped.c        optional dm_target_striped
+dev/disk/dm/delay/dm_target_delay.c    optional dm_target_delay
+dev/disk/dm/flakey/dm_target_flakey.c  optional dm_target_flakey
 
 dev/disk/iscsi/initiator/isc_cam.c     optional iscsi_initiator scbus
 dev/disk/iscsi/initiator/isc_sm.c      optional iscsi_initiator scbus
index 7195e84..af5b333 100644 (file)
@@ -4,6 +4,6 @@ SRCS=   device-mapper.c dm_dev.c dm_ioctl.c dm_pdev.c dm_table.c \
 
 SRCS+= dm_target_error.c dm_target_zero.c
 
-SUBDIR=        targets
+SUBDIR= linear striped crypt delay flakey
 
 .include <bsd.kmod.mk>
diff --git a/sys/dev/disk/dm/targets/Makefile b/sys/dev/disk/dm/targets/Makefile
deleted file mode 100644 (file)
index 4a5fa8b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIR= linear striped crypt delay flakey
-
-.include <bsd.subdir.mk>