From 61413047f5628bada4fb377893cb1ece31afd088 Mon Sep 17 00:00:00 2001
From: Alex Hornung <ahornung@gmail.com>
Date: Fri, 9 Jul 2010 19:36:57 +0100
Subject: [PATCH] dm - Bind into build system, fix small problem

* Bind into the kernel build system.

* Make cmd_fn static, so it doesn't interfere with udev's cmd_fn
---
 sys/conf/files                  | 14 ++++++++++++++
 sys/config/LINT                 |  3 +++
 sys/dev/disk/Makefile           |  2 +-
 sys/dev/disk/dm/device-mapper.c |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 802f183b53..ca23992fd9 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -61,6 +61,20 @@ bus/cam/scsi/scsi_sg.c			optional sg
 bus/cam/scsi/scsi_target.c		optional targ
 bus/cam/scsi/scsi_targ_bh.c		optional targbh
 
+dev/disk/dm/device-mapper.c		optional dm
+dev/disk/dm/dm_dev.c			optional dm
+dev/disk/dm/dm_ioctl.c			optional dm
+dev/disk/dm/dm_pdev.c			optional dm
+dev/disk/dm/dm_table.c			optional dm
+dev/disk/dm/dm_target.c			optional dm
+dev/disk/dm/dm_target_crypt.c		optional dm
+dev/disk/dm/dm_target_error.c		optional dm
+dev/disk/dm/dm_target_linear.c		optional dm
+#dev/disk/dm/dm_target_mirror.c		optional dm
+#dev/disk/dm/dm_target_snapshot.c	optional dm
+dev/disk/dm/dm_target_stripe.c		optional dm
+dev/disk/dm/dm_target_zero.c		optional dm
+
 dev/disk/iscsi/initiator/isc_cam.c	optional iscsi_initiator scbus
 dev/disk/iscsi/initiator/isc_sm.c	optional iscsi_initiator scbus
 dev/disk/iscsi/initiator/isc_soc.c	optional iscsi_initiator scbus
diff --git a/sys/config/LINT b/sys/config/LINT
index 13af91c170..c5ee8cb650 100644
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -924,6 +924,9 @@ device		sg			#Passthrough device (linux scsi generic)
 device		pt			#SCSI processor type
 device		ses			#SCSI SES/SAF-TE driver
 
+# Options for device mapper
+device		dm
+
 # Options for iSCSI
 device	        iscsi_initiator
 options		ISCSI_INITIATOR_DEBUG=8
diff --git a/sys/dev/disk/Makefile b/sys/dev/disk/Makefile
index d1054d52ab..912341328f 100644
--- a/sys/dev/disk/Makefile
+++ b/sys/dev/disk/Makefile
@@ -1,6 +1,6 @@
 .include "${.CURDIR}/../../platform/${MACHINE_PLATFORM}/Makefile.inc"
 
-SUBDIR= aha ahci aic aic7xxx ccd iscsi ispfw md mmcsd mpt ncv nsp
+SUBDIR= aha ahci aic aic7xxx ccd dm iscsi ispfw md mmcsd mpt ncv nsp
 SUBDIR+= sbp sdhci sili stg trm vn vpo
 
 .for dir in ${SUBDIR}
diff --git a/sys/dev/disk/dm/device-mapper.c b/sys/dev/disk/dm/device-mapper.c
index 2b24fb6a2e..bc77449122 100644
--- a/sys/dev/disk/dm/device-mapper.c
+++ b/sys/dev/disk/dm/device-mapper.c
@@ -108,7 +108,7 @@ DECLARE_MODULE(dm, dm_mod, SI_SUB_RAID, SI_ORDER_ANY);
  * ioctl to kernel but will do another things in userspace.
  *
  */
-struct cmd_function cmd_fn[] = {
+static struct cmd_function cmd_fn[] = {
 		{ .cmd = "version", .fn = dm_get_version_ioctl},
 		{ .cmd = "targets", .fn = dm_list_versions_ioctl},
 		{ .cmd = "create",  .fn = dm_dev_create_ioctl},
-- 
2.11.4.GIT