Move final zvol_remove_minors to common code

This logic is not platform dependent and should reside in the
common code.

Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Jorgen Lundman <lundman@lundman.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #9505

diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c
index 52725499a8701a3a9b8778450fe332fa4e0c27b4..f234b854454ddeecfa263ead3fe15586d5b95b62 100644 (file)
--- a/module/os/linux/zfs/zvol_os.c
+++ b/module/os/linux/zfs/zvol_os.c
@@ -1092,16 +1092,6 @@ zvol_init(void)
 void
 zvol_fini(void)
 {
-       zvol_remove_minors_impl(NULL);
-
-       /*
-        * The call to "zvol_remove_minors_impl" may dispatch entries to
-        * the system_taskq, but it doesn't wait for those entires to
-        * complete before it returns. Thus, we must wait for all of the
-        * removals to finish, before we can continue.
-        */
-       taskq_wait_outstanding(system_taskq, 0);
-
        zvol_fini_impl();
        blk_unregister_region(MKDEV(zvol_major, 0), 1UL << MINORBITS);
        unregister_blkdev(zvol_major, ZVOL_DRIVER);

diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index 19c20afe7bc59188e5bf67b698e46be96a2a97b4..5006b6af8277b59dbd7260c847aecb12ac98c920 100644 (file)
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -1713,6 +1713,16 @@ zvol_init_impl(void)
 void
 zvol_fini_impl(void)
 {
+       zvol_remove_minors_impl(NULL);
+
+       /*
+        * The call to "zvol_remove_minors_impl" may dispatch entries to
+        * the system_taskq, but it doesn't wait for those entires to
+        * complete before it returns. Thus, we must wait for all of the
+        * removals to finish, before we can continue.
+        */
+       taskq_wait_outstanding(system_taskq, 0);
+
        kmem_free(zvol_htable, ZVOL_HT_SIZE * sizeof (struct hlist_head));
        list_destroy(&zvol_state_list);
        rw_destroy(&zvol_state_lock);