 @@ -1,14 +1,14 @@
-/*	$NetBSD: ccd_60.c,v 1.1.2.6 2018/03/20 08:11:25 pgoyette Exp $	*/
+/*	$NetBSD: ccd_60.c,v 1.1.2.7 2018/09/16 04:57:22 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,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: ccd_60.c,v 1.1.2.6 2018/03/20 08:11:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.1.2.7 2018/09/16 04:57:22 pgoyette Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/disk.h>
 #include <sys/lwp.h>
 #include <sys/compat_stub.h>
 #include <dev/ccdvar.h>
 #include <compat/sys/ccdvar.h>
 @@ -81,26 +81,29 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
 		if (data == NULL)
 			return ENOSYS;
 		/*
 		 * ccio_size member not used, so existing struct OK
 		 * drop through to existing non-compat version
 		 */
 		return (*f)(dev, CCDIOCCLR, data, flag, l);
 #endif
 	default:
 		return ENOSYS;
+	}
+}
 COMPAT_SET_HOOK(ccd_ioctl_60_hook, "ccd_60", compat_60_ccdioctl);
 COMPAT_UNSET_HOOK(ccd_ioctl_60_hook);
 void
 ccd_60_init(void)
+{
-	compat_ccd_ioctl_60 = compat_60_ccdioctl;
+	ccd_ioctl_60_hook_set();
+}
 void
 ccd_60_fini(void)
+{
-	compat_ccd_ioctl_60 = (void *)enosys;
+	ccd_ioctl_60_hook_unset();
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ccd.c,v 1.175.2.4 2018/03/23 09:22:24 pgoyette Exp $	*/
+/*	$NetBSD: ccd.c,v 1.175.2.5 2018/09/16 04:57:22 pgoyette Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe, and by Andrew Doran.
+ *
  * 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.
 @@ -78,27 +78,27 @@
  *    sc_stop, sc_bufq and b_resid from master buffers.
+ *
  * => a combination of CCDF_INITED, sc_inflight, and sc_iolock is used to
  *    serialize I/O and configuration changes.
+ *
  * => the in-core disk label does not change while the device is open.
+ *
  * On memory consumption: ccd fans out I/O requests and so needs to
  * allocate memory.  If the system is desperately low on memory, we
  * single thread I/O.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.4 2018/03/23 09:22:24 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.5 2018/09/16 04:57:22 pgoyette Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 #include <sys/buf.h>
 #include <sys/kmem.h>
 #include <sys/pool.h>
 @@ -1046,26 +1046,36 @@ ccdread(dev_t dev, struct uio *uio, int
 	if (ccddebug & CCDB_FOLLOW)
 		printf("ccdread(0x%"PRIx64", %p)\n", dev, uio);
 #endif
 	if ((cs = ccdget(unit, 0)) == NULL)
 		return 0;
 	/* Unlocked advisory check, ccdstrategy check is synchronous. */
 	if ((cs->sc_flags & CCDF_INITED) == 0)
 		return (ENXIO);
 	return (physio(ccdstrategy, NULL, dev, B_READ, minphys, uio));
+}
 /* Hook the compat_60 ioctl code
+ *
  * This looks ugly, since we pass the "real" ioctl function as an
  * argument to the compat_xxx function.
  */
 COMPAT_CALL_HOOK(ccd_ioctl_60_hook, f, (dev_t dev, u_long cmd, void *data,
     int flag, struct lwp *l, int (*ff)(dev_t, u_long, void *, int,
 					 struct lwp *)),
     (dev, cmd, data, flag, l, ccdioctl), enosys());
 /* ARGSUSED */
 static int
 ccdwrite(dev_t dev, struct uio *uio, int flags)
+{
 	int unit = ccdunit(dev);
 	struct ccd_softc *cs;
 #ifdef DEBUG
 	if (ccddebug & CCDB_FOLLOW)
 		printf("ccdwrite(0x%"PRIx64", %p)\n", dev, uio);
 #endif
 	if ((cs = ccdget(unit, 0)) == NULL)
 		return ENOENT;
 @@ -1088,38 +1098,39 @@ ccdioctl(dev_t dev, u_long cmd, void *da
 	kauth_cred_t uc;
 	char **cpp;
 	struct pathbuf *pb;
 	struct vnode **vpp;
 #ifdef __HAVE_OLD_DISKLABEL
 	struct disklabel newlabel;
 #endif
 	switch (cmd) {
 	case CCDIOCSET:
 		make = 1;
 		break;
 	default:
-		if ((*compat_ccd_ioctl_60)(0, cmd, NULL, 0, NULL, NULL) == 0)
+		if (ccd_ioctl_60_hook_f_call(0, cmd, NULL, 0, NULL, NULL)
 		    == 0)
 			make = 1;
 		else
 			make = 0;
 		break;
+	}
 	if ((cs = ccdget(unit, make)) == NULL)
 		return ENOENT;
 	uc = kauth_cred_get();
-	error = (*compat_ccd_ioctl_60)(dev, cmd, data, flag, l, ccdioctl);
+	error = ccd_ioctl_60_hook_f_call(dev, cmd, data, flag, l, ccdioctl);
 	if (error != ENOSYS)
 		return error;
 	/* Must be open for writes for these commands... */
 	switch (cmd) {
 	case CCDIOCSET:
 	case CCDIOCCLR:
 	case DIOCSDINFO:
 	case DIOCWDINFO:
 	case DIOCCACHESYNC:
 	case DIOCAWEDGE:
 	case DIOCDWEDGE:
 	case DIOCMWEDGES:

 @@ -1,14 +1,14 @@
-/* $NetBSD: compat_stub.c,v 1.1.2.16 2018/09/15 05:56:50 pgoyette Exp $	*/
+/* $NetBSD: compat_stub.c,v 1.1.2.17 2018/09/16 04:57:22 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Goyette
+ *
  * 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.
 @@ -54,28 +54,28 @@ int (*vec_ntp_timestatus)(void) = ntp_ti
 #else
 void (*vec_ntp_gettime)(struct ntptimeval *) = NULL;
 int (*vec_ntp_timestatus)(void) = NULL;
 #endif
 #if NUSB > 0
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #endif
 /*
  * ccd device compatability ioctl
  */
 int (*compat_ccd_ioctl_60)(dev_t, u_long, void *, int, struct lwp *,
-    int (*f)(dev_t, u_long, void *, int, struct lwp *)) = (void *)enosys;
+struct ccd_ioctl_60_hook_t ccd_ioctl_60_hook;
 /*
  * clockctl device compatability ioctl
  */
 int (*compat_clockctl_ioctl_50)(dev_t, u_long, void *, int, struct lwp *) =
     (void *)enosys;
 /*
  * if_sppp device compatability ioctl subroutine
  */
 int (*sppp_params50)(struct sppp *, u_long, void *) = (void *)enosys;
 /*