 @@ -1,14 +1,14 @@
-/* $NetBSD: dm_ioctl.c,v 1.56 2022/10/13 06:10:48 andvar Exp $      */
+/* $NetBSD: dm_ioctl.c,v 1.57 2024/01/14 07:56:53 mlelstv 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_ioctl.c,v 1.56 2022/10/13 06:10:48 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.57 2024/01/14 07:56:53 mlelstv Exp $");
 /*
  * Locking is used to synchronise between ioctl calls and between dm_table's
  * users.
+ *
  * ioctl locking:
  * Simple reference counting, to count users of device will be used routines
  * dm_dev_busy/dm_dev_unbusy are used for that.
  * dm_dev_lookup/dm_dev_rem call dm_dev_busy before return(caller is therefore
  * holder of reference_counter last).
+ *
  * ioctl routines which change/remove dm_dev parameters must wait on
  * dm_dev::dev_cv and when last user will call dm_dev_unbusy they will wake
 @@ -199,65 +199,68 @@ dm_dev_create_ioctl(prop_dictionary_t dm
 	/* Get needed values from dictionary. */
 	prop_dictionary_get_string(dm_dict, DM_IOCTL_NAME, &name);
 	prop_dictionary_get_string(dm_dict, DM_IOCTL_UUID, &uuid);
 	prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags);
 	dm_dbg_print_flags(flags);
 	/* Lookup name and uuid if device already exist quit. */
 	if ((dmv = dm_dev_lookup(name, uuid, -1)) != NULL) {
 		DM_ADD_FLAG(flags, DM_EXISTS_FLAG);	/* Device already exists */
 		dm_dev_unbusy(dmv);
 		return EEXIST;
+	}
 	if ((dmv = dm_dev_alloc()) == NULL)
 		return ENOMEM;
 	cf = kmem_alloc(sizeof(*cf), KM_SLEEP);
 	cf->cf_name = dm_cd.cd_name;
 	cf->cf_atname = dm_ca.ca_name;
 	cf->cf_unit = atomic_inc_32_nv(&sc_minor_num);
 	cf->cf_fstate = FSTATE_NOTFOUND;
 	if ((devt = config_attach_pseudo(cf)) == NULL) {
 		dm_dev_free(dmv);
 		kmem_free(cf, sizeof(*cf));
 		aprint_error("Unable to attach pseudo device dm/%s\n", name);
 		return (ENOMEM);
+	}
 	if ((dmv = dm_dev_alloc()) == NULL)
 		return ENOMEM;
 	if (uuid)
 		strncpy(dmv->uuid, uuid, DM_UUID_LEN);
 	else
 		dmv->uuid[0] = '\0';
 	if (name)
 		strlcpy(dmv->name, name, DM_NAME_LEN);
 	dmv->minor = cf->cf_unit;
 	dmv->flags = 0;		/* device flags are set when needed */
 	dmv->ref_cnt = 0;
 	dmv->event_nr = 0;
 	dmv->devt = devt;
 	dm_table_head_init(&dmv->table_head);
 	mutex_init(&dmv->dev_mtx, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(&dmv->diskp_mtx, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&dmv->dev_cv, "dm_dev");
 	if (flags & DM_READONLY_FLAG)
 		dmv->flags |= DM_READONLY_FLAG;
 	prop_dictionary_set_uint32(dm_dict, DM_IOCTL_MINOR, dmv->minor);
-	disk_init(dmv->diskp, dmv->name, &dmdkdriver);
+	disk_init(dmv->diskp, device_xname(devt), &dmdkdriver);
 	disk_attach(dmv->diskp);
 	dmv->diskp->dk_info = NULL;
 	if ((r = dm_dev_insert(dmv)) != 0)
 		dm_dev_free(dmv);
 	DM_ADD_FLAG(flags, DM_EXISTS_FLAG);
 	DM_REMOVE_FLAG(flags, DM_INACTIVE_PRESENT_FLAG);
 	/* Increment device counter After creating device */
 	atomic_inc_32(&dm_dev_counter);