dm - Bind into build system, fix small problem
authorAlex Hornung <ahornung@gmail.com>
Fri, 9 Jul 2010 18:36:57 +0000 (19:36 +0100)
committerAlex Hornung <ahornung@gmail.com>
Sun, 11 Jul 2010 21:05:56 +0000 (22:05 +0100)
* Bind into the kernel build system.

* Make cmd_fn static, so it doesn't interfere with udev's cmd_fn

sys/conf/files
sys/config/LINT
sys/dev/disk/Makefile
sys/dev/disk/dm/device-mapper.c

index 802f183..ca23992 100644 (file)
@@ -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
index 13af91c..c5ee8cb 100644 (file)
@@ -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
index d1054d5..9123413 100644 (file)
@@ -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}
index 2b24fb6..bc77449 100644 (file)
@@ -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},