[src/trunk]: src/external/cddl/osnet/sys/sys Use callout_halt, not callout_st...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7f6632eb2bde
branches:  trunk
changeset: 836987:7f6632eb2bde
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Nov 15 05:43:57 2018 +0000

description:
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.

diffstat:

 external/cddl/osnet/sys/sys/zfs_context.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r ed52d2c18f4c -r 7f6632eb2bde external/cddl/osnet/sys/sys/zfs_context.h
--- a/external/cddl/osnet/sys/sys/zfs_context.h Thu Nov 15 05:14:20 2018 +0000
+++ b/external/cddl/osnet/sys/sys/zfs_context.h Thu Nov 15 05:43:57 2018 +0000
@@ -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 @@
 #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 */