 @@ -1,14 +1,14 @@
-/*        $NetBSD: dm_pdev.c,v 1.16 2019/12/06 16:46:14 tkusumi Exp $      */
+/*        $NetBSD: dm_pdev.c,v 1.17 2019/12/07 06:26:31 tkusumi Exp $      */
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Hamsik.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.16 2019/12/06 16:46:14 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_pdev.c,v 1.17 2019/12/07 06:26:31 tkusumi Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/disk.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/namei.h>
 #include <dev/dkvar.h>
 #include "dm.h"
 @@ -178,36 +178,36 @@ dm_pdev_rem(dm_pdev_t * dmp)
 			return error;
+	}
 	kmem_free(dmp, sizeof(*dmp));
 	return 0;
+}
 /*
  * Destroy all existing pdev's in device-mapper.
  */
 int
 dm_pdev_destroy(void)
+{
-	dm_pdev_t *dm_pdev;
+	dm_pdev_t *dmp;
 	mutex_enter(&dm_pdev_mutex);
 	while (!SLIST_EMPTY(&dm_pdev_list)) {	/* List Deletion. */
 		dm_pdev = SLIST_FIRST(&dm_pdev_list);
 		SLIST_REMOVE_HEAD(&dm_pdev_list, next_pdev);
-		dm_pdev_rem(dm_pdev);
+	while ((dmp = SLIST_FIRST(&dm_pdev_list)) != NULL) {
 		SLIST_REMOVE(&dm_pdev_list, dmp, dm_pdev, next_pdev);
 		dm_pdev_rem(dmp);
+	}
 	KASSERT(SLIST_EMPTY(&dm_pdev_list));
 	mutex_exit(&dm_pdev_mutex);
 	mutex_destroy(&dm_pdev_mutex);
 	return 0;
+}
 /*
  * This funcion is called from dm_dev_remove_ioctl.
  * When I'm removing device from list, I have to decrement
  * reference counter. If reference counter is 0 I will remove
  * dmp from global list and from device list to. And I will CLOSE
  * dmp vnode too.
  */

 @@ -1,14 +1,14 @@
-/*        $NetBSD: dm_table.c,v 1.10 2019/12/05 16:59:43 tkusumi Exp $      */
+/*        $NetBSD: dm_table.c,v 1.11 2019/12/07 06:26:31 tkusumi Exp $      */
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Hamsik.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.10 2019/12/05 16:59:43 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.11 2019/12/07 06:26:31 tkusumi Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include "dm.h"
 /*
  * There are two types of users of this interface:
+ *
  * a) Readers such as
  *    dmstrategy, dmgetdisklabel, dmsize, dm_dev_status_ioctl,
 @@ -150,35 +150,34 @@ dm_table_destroy(dm_table_head_t * head,
 	aprint_debug("dm_Table_destroy called with %d--%d\n", table_id, head->io_cnt);
 	while (head->io_cnt != 0)
 		cv_wait(&head->table_cv, &head->table_mtx);
 	if (table_id == DM_TABLE_ACTIVE)
 		id = head->cur_active_table;
 	else
 		id = 1 - head->cur_active_table;
 	tbl = &head->tables[id];
-	while (!SLIST_EMPTY(tbl)) {	/* List Deletion. */
+	while ((table_en = SLIST_FIRST(tbl)) != NULL) {
-		table_en = SLIST_FIRST(tbl);
+		SLIST_REMOVE(tbl, table_en, dm_table_entry, next);
 		if (table_en->target->destroy(table_en) == 0)
 			table_en->target_config = NULL;
 		SLIST_REMOVE_HEAD(tbl, next);
 		kmem_free(table_en, sizeof(*table_en));
+	}
 	KASSERT(SLIST_EMPTY(tbl));
 	mutex_exit(&head->table_mtx);
 	return 0;
+}
 /*
  * Return length of active table in device.
  */
 static inline uint64_t
 dm_table_size_impl(dm_table_head_t * head, int table)
+{
 	dm_table_t *tbl;

 @@ -1,14 +1,14 @@
-/*        $NetBSD: dm_target.c,v 1.23 2019/12/06 16:11:59 tkusumi Exp $      */
+/*        $NetBSD: dm_target.c,v 1.24 2019/12/07 06:26:31 tkusumi Exp $      */
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Hamsik.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code Must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -19,27 +19,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.23 2019/12/06 16:11:59 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.24 2019/12/07 06:26:31 tkusumi Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include "netbsd-dm.h"
 #include "dm.h"
 static dm_target_t *dm_target_lookup_name(const char *);
 @@ -210,34 +210,33 @@ dm_target_rem(char *dm_target_name)
+}
 /*
  * Destroy all targets and remove them from queue.
  * This routine is called from dm_detach, before module
  * is unloaded.
  */
 int
 dm_target_destroy(void)
+{
 	dm_target_t *dm_target;
 	mutex_enter(&dm_target_mutex);
 	while (TAILQ_FIRST(&dm_target_list) != NULL) {
 		dm_target = TAILQ_FIRST(&dm_target_list);
 		TAILQ_REMOVE(&dm_target_list, TAILQ_FIRST(&dm_target_list),
 		    dm_target_next);
 	while ((dm_target = TAILQ_FIRST(&dm_target_list)) != NULL) {
 		TAILQ_REMOVE(&dm_target_list, dm_target, dm_target_next);
 		(void)kmem_free(dm_target, sizeof(dm_target_t));
+	}
 	KASSERT(TAILQ_EMPTY(&dm_target_list));
 	mutex_exit(&dm_target_mutex);
 	mutex_destroy(&dm_target_mutex);
 	return 0;
+}
 /*
  * Allocate new target entry.
  */
 dm_target_t *
 dm_target_alloc(const char *name)
+{