[src/trunk]: src/sys/dev/dm dm: Unbreak compilation of kernel modules

[tkusumi <tkusumi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fef306bc3cef
branches:  trunk
changeset: 847044:fef306bc3cef
user:      tkusumi <tkusumi%NetBSD.org@localhost>
date:      Sun Dec 08 10:35:53 2019 +0000

description:
dm: Unbreak compilation of kernel modules

The dm kernel modules (MK_DM_TARGETS enabled in sys/modules/dm/Makefile)
have been broken. Unbreak the build.

diffstat:

 sys/dev/dm/dm.h                 |  4 ++--
 sys/dev/dm/dm_target.c          |  6 +++---
 sys/dev/dm/dm_target_snapshot.c |  9 +++------
 3 files changed, 8 insertions(+), 11 deletions(-)

diffs (88 lines):

diff -r 319833b0b61c -r fef306bc3cef sys/dev/dm/dm.h
--- a/sys/dev/dm/dm.h   Sun Dec 08 10:12:19 2019 +0000
+++ b/sys/dev/dm/dm.h   Sun Dec 08 10:35:53 2019 +0000
@@ -1,4 +1,4 @@
-/*        $NetBSD: dm.h,v 1.35 2019/12/08 04:41:02 tkusumi Exp $      */
+/*        $NetBSD: dm.h,v 1.36 2019/12/08 10:35:53 tkusumi Exp $      */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -265,7 +265,7 @@
 int dm_target_insert(dm_target_t *);
 prop_array_t dm_target_prop_list(void);
 dm_target_t* dm_target_lookup(const char *);
-int dm_target_rem(char *);
+int dm_target_rem(const char *);
 void dm_target_unbusy(dm_target_t *);
 void dm_target_busy(dm_target_t *);
 
diff -r 319833b0b61c -r fef306bc3cef sys/dev/dm/dm_target.c
--- a/sys/dev/dm/dm_target.c    Sun Dec 08 10:12:19 2019 +0000
+++ b/sys/dev/dm/dm_target.c    Sun Dec 08 10:35:53 2019 +0000
@@ -1,4 +1,4 @@
-/*        $NetBSD: dm_target.c,v 1.25 2019/12/07 15:28:39 tkusumi Exp $      */
+/*        $NetBSD: dm_target.c,v 1.26 2019/12/08 10:35:53 tkusumi Exp $      */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.25 2019/12/07 15:28:39 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.26 2019/12/08 10:35:53 tkusumi Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -183,7 +183,7 @@
  * Remove target from TAIL, target is selected with its name.
  */
 int
-dm_target_rem(char *dm_target_name)
+dm_target_rem(const char *dm_target_name)
 {
        dm_target_t *dmt;
 
diff -r 319833b0b61c -r fef306bc3cef sys/dev/dm/dm_target_snapshot.c
--- a/sys/dev/dm/dm_target_snapshot.c   Sun Dec 08 10:12:19 2019 +0000
+++ b/sys/dev/dm/dm_target_snapshot.c   Sun Dec 08 10:35:53 2019 +0000
@@ -1,4 +1,4 @@
-/*        $NetBSD: dm_target_snapshot.c,v 1.26 2019/12/08 04:41:02 tkusumi Exp $      */
+/*        $NetBSD: dm_target_snapshot.c,v 1.27 2019/12/08 10:35:53 tkusumi Exp $      */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.26 2019/12/08 04:41:02 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.27 2019/12/08 10:35:53 tkusumi Exp $");
 
 /*
  * 1. Suspend my_data to temporarily stop any I/O while the snapshot is being
@@ -240,8 +240,6 @@
 
        table_en->target_config = tsc;
 
-       dmv->sec_size = dmp_snap->dmp_secsize;
-
        return 0;
 }
 
@@ -258,14 +256,13 @@
        uint32_t i;
        uint32_t count;
        size_t prm_len, cow_len;
-       char *params, *cow_name;
+       char *params;
 
        tsc = target_config;
 
        prm_len = 0;
        cow_len = 0;
        count = 0;
-       cow_name = NULL;
 
        printf("Snapshot target status function called\n");