From fe26b32950204bd14a26368751ffe17122a5f0cf Mon Sep 17 00:00:00 2001
From: riastradh <riastradh@NetBSD.org>
Date: Thu, 15 Nov 2018 05:43:57 +0000
Subject: [PATCH] Use callout_halt, not callout_stop, for FreeBSD callout_drain
 shim.

Callers expect callout_drain will wait for it to complete if it has
fired.
---
 external/cddl/osnet/sys/sys/zfs_context.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/external/cddl/osnet/sys/sys/zfs_context.h b/external/cddl/osnet/sys/sys/zfs_context.h
index f0ed85beec3f..0a00c87107f1 100644
--- a/external/cddl/osnet/sys/sys/zfs_context.h
+++ b/external/cddl/osnet/sys/sys/zfs_context.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: zfs_context.h,v 1.19 2018/05/28 21:05:10 chs Exp $	*/
+/*	$NetBSD: zfs_context.h,v 1.20 2018/11/15 05:43:57 riastradh Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -789,7 +789,7 @@ void zfs_netbsd_setsize(vnode_t *, off_t);
 #define getf		fd_getfile
 #define releasef	fd_putfile
 
-#define callout_drain(x) callout_stop(x)
+#define callout_drain(x) callout_halt(x, NULL)
 
 #endif	/* _KERNEL */