svn commit: r327491 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Mark Johnston]

Author: markj
Date: Tue Jan  2 16:14:36 2018
New Revision: 327491
URL: https://svnweb.freebsd.org/changeset/base/327491

Log:
  MFC r326919:
  Unregister the ARC lowmem event handler earlier in arc_fini().

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Tue Jan  2 14:54:54 2018	(r327490)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Tue Jan  2 16:14:36 2018	(r327491)
@@ -6619,6 +6619,11 @@ arc_init(void)
 void
 arc_fini(void)
 {
+#ifdef _KERNEL
+	if (arc_event_lowmem != NULL)
+		EVENTHANDLER_DEREGISTER(vm_lowmem, arc_event_lowmem);
+#endif
+
 	mutex_enter(&arc_reclaim_lock);
 	arc_reclaim_thread_exit = B_TRUE;
 	/*
@@ -6664,11 +6669,6 @@ arc_fini(void)
 	buf_fini();
 
 	ASSERT0(arc_loaned_bytes);
-
-#ifdef _KERNEL
-	if (arc_event_lowmem != NULL)
-		EVENTHANDLER_DEREGISTER(vm_lowmem, arc_event_lowmem);
-#endif
 }
 
 /*