diff options
author | markj <markj@FreeBSD.org> | 2018-01-02 16:14:36 +0000 |
---|---|---|
committer | markj <markj@FreeBSD.org> | 2018-01-02 16:14:36 +0000 |
commit | 53bdbb32ff6b5bd369c58a0162448613fc8ff1d9 (patch) | |
tree | 5c3734945be1fb37443a0f6b1ec6907df27363d6 /sys/cddl | |
parent | a01ded2093f5111e954801c9d2f09d588cb8414a (diff) | |
download | FreeBSD-src-53bdbb32ff6b5bd369c58a0162448613fc8ff1d9.zip FreeBSD-src-53bdbb32ff6b5bd369c58a0162448613fc8ff1d9.tar.gz |
MFC r326919:
Unregister the ARC lowmem event handler earlier in arc_fini().
Diffstat (limited to 'sys/cddl')
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c index a986f0d..063bd8b 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c @@ -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 } /* |