Module Name: src
Committed By: riastradh
Date: Thu Nov 15 05:43:57 UTC 2018
Modified Files:
src/external/cddl/osnet/sys/sys: zfs_context.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/sys/sys/zfs_context.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/zfs_context.h
diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.19 src/external/cddl/osnet/sys/sys/zfs_context.h:1.20
--- src/external/cddl/osnet/sys/sys/zfs_context.h:1.19 Mon May 28 21:05:10 2018
+++ src/external/cddl/osnet/sys/sys/zfs_context.h Thu Nov 15 05:43:57 2018
@@ -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 */
