 @@ -1,14 +1,14 @@
-/*	$NetBSD: fss.c,v 1.112 2022/03/31 19:30:15 pgoyette Exp $	*/
+/*	$NetBSD: fss.c,v 1.113 2022/09/24 23:18:54 thorpej Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Juergen Hannken-Illjes.
+ *
  * 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.
 @@ -26,34 +26,34 @@
  * 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.
  */
 /*
  * File system snapshot disk driver.
+ *
  * Block/character interface to the snapshot of a mounted file system.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.112 2022/03/31 19:30:15 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.113 2022/09/24 23:18:54 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
-#include <sys/malloc.h>
+#include <sys/kmem.h>
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/file.h>
 #include <sys/uio.h>
 #include <sys/conf.h>
 #include <sys/kthread.h>
 #include <sys/fstrans.h>
 @@ -150,27 +150,27 @@ fss_match(device_t self, cfdata_t cfdata
+}
 static void
 fss_attach(device_t parent, device_t self, void *aux)
+{
 	struct fss_softc *sc = device_private(self);
 	sc->sc_dev = self;
 	sc->sc_bdev = NODEV;
 	mutex_init(&sc->sc_slock, MUTEX_DEFAULT, IPL_NONE);
 	cv_init(&sc->sc_work_cv, "fssbs");
 	cv_init(&sc->sc_cache_cv, "cowwait");
 	bufq_alloc(&sc->sc_bufq, "fcfs", 0);
-	sc->sc_dkdev = malloc(sizeof(*sc->sc_dkdev), M_DEVBUF, M_WAITOK);
+	sc->sc_dkdev = kmem_zalloc(sizeof(*sc->sc_dkdev), KM_SLEEP);
 	sc->sc_dkdev->dk_info = NULL;
 	disk_init(sc->sc_dkdev, device_xname(self), NULL);
 	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	if (fss_num_attached++ == 0)
 		vfs_hooks_attach(&fss_vfs_hooks);
+}
 static int
 fss_detach(device_t self, int flags)
+{
 	struct fss_softc *sc = device_private(self);
 @@ -182,45 +182,45 @@ fss_detach(device_t self, int flags)
+	}
 	mutex_exit(&sc->sc_slock);
 	if (--fss_num_attached == 0)
 		vfs_hooks_detach(&fss_vfs_hooks);
 	pmf_device_deregister(self);
 	mutex_destroy(&sc->sc_slock);
 	cv_destroy(&sc->sc_work_cv);
 	cv_destroy(&sc->sc_cache_cv);
 	bufq_drain(sc->sc_bufq);
 	bufq_free(sc->sc_bufq);
 	disk_destroy(sc->sc_dkdev);
-	free(sc->sc_dkdev, M_DEVBUF);
+	kmem_free(sc->sc_dkdev, sizeof(*sc->sc_dkdev));
 	return 0;
+}
 int
 fss_open(dev_t dev, int flags, int mode, struct lwp *l)
+{
 	int mflag;
 	cfdata_t cf;
 	struct fss_softc *sc;
 	mflag = (mode == S_IFCHR ? FSS_CDEV_OPEN : FSS_BDEV_OPEN);
 	mutex_enter(&fss_device_lock);
 	sc = device_lookup_private(&fss_cd, minor(dev));
 	if (sc == NULL) {
-		cf = malloc(sizeof(*cf), M_DEVBUF, M_WAITOK);
+		cf = kmem_zalloc(sizeof(*cf), KM_SLEEP);
 		cf->cf_name = fss_cd.cd_name;
 		cf->cf_atname = fss_cd.cd_name;
 		cf->cf_unit = minor(dev);
 		cf->cf_fstate = FSTATE_STAR;
 		sc = device_private(config_attach_pseudo(cf));
 		if (sc == NULL) {
 			mutex_exit(&fss_device_lock);
 			return ENOMEM;
+		}
 		sc->sc_state = FSS_IDLE;
+	}
 	mutex_enter(&sc->sc_slock);
 @@ -264,27 +264,27 @@ restart:
+	}
 	if (sc->sc_state != FSS_IDLE) {
 		mutex_exit(&sc->sc_slock);
 		mutex_exit(&fss_device_lock);
 		return error;
+	}
 	KASSERT(sc->sc_state == FSS_IDLE);
 	KASSERT((sc->sc_flags & (FSS_CDEV_OPEN|FSS_BDEV_OPEN)) == mflag);
 	mutex_exit(&sc->sc_slock);
 	cf = device_cfdata(sc->sc_dev);
 	error = config_detach(sc->sc_dev, DETACH_QUIET);
 	if (! error)
-		free(cf, M_DEVBUF);
+		kmem_free(cf, sizeof(*cf));
 	mutex_exit(&fss_device_lock);
 	return error;
+}
 void
 fss_strategy(struct buf *bp)
+{
 	const bool write = ((bp->b_flags & B_READ) != B_READ);
 	struct fss_softc *sc = device_lookup_private(&fss_cd, minor(bp->b_dev));
 	if (sc == NULL) {
 		bp->b_error = ENXIO;