svn commit: r362048 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Andriy Gapon avg at FreeBSD.org
Thu Jun 11 11:35:30 UTC 2020


Author: avg
Date: Thu Jun 11 11:35:30 2020
New Revision: 362048
URL: https://svnweb.freebsd.org/changeset/base/362048

Log:
  fix up r362047: a call to zvol_*_minors() was not hidden from userland
  
  Reported by:	CI/FreeBSD-head-powerpc64-build
  MFC after:	5 weeks
  X-MFC with:	r362047

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Thu Jun 11 10:41:31 2020	(r362047)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Thu Jun 11 11:35:30 2020	(r362048)
@@ -6144,7 +6144,9 @@ spa_export_common(char *pool, int new_state, nvlist_t 
 	mutex_exit(&spa_namespace_lock);
 	spa_async_suspend(spa);
 	if (spa->spa_zvol_taskq) {
+#ifdef _KERNEL
 		zvol_remove_minors(spa, spa_name(spa));
+#endif
 		taskq_wait(spa->spa_zvol_taskq);
 	}
 	mutex_enter(&spa_namespace_lock);


More information about the svn-src-all mailing list