svn commit: r265746 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Fri May  9 07:21:32 2014
New Revision: 265746
URL: http://svnweb.freebsd.org/changeset/base/265746

Log:
  MFC r265458:
  Import George Wilson's change for Illumos #4730:
  
  	4730 metaslab group taskq should be destroyed in metaslab_group_destroy()
  	Reviewed by: Alex Reece <alex.reece at delphix.com>
  	Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  	Reviewed by: Sebastien Roy <sebastien.roy at delphix.com>
  
  	Original author: George Wilson

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

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c	Fri May  9 07:17:29 2014	(r265745)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c	Fri May  9 07:21:32 2014	(r265746)
@@ -411,7 +411,7 @@ metaslab_group_create(metaslab_class_t *
 	mg->mg_class = mc;
 	mg->mg_activation_count = 0;
 
-	mg->mg_taskq = taskq_create("metaslab_group_tasksq", metaslab_load_pct,
+	mg->mg_taskq = taskq_create("metaslab_group_taskq", metaslab_load_pct,
 	    minclsyspri, 10, INT_MAX, TASKQ_THREADS_CPU_PCT);
 
 	return (mg);
@@ -429,6 +429,7 @@ metaslab_group_destroy(metaslab_group_t 
 	 */
 	ASSERT(mg->mg_activation_count <= 0);
 
+	taskq_destroy(mg->mg_taskq);
 	avl_destroy(&mg->mg_metaslab_tree);
 	mutex_destroy(&mg->mg_lock);
 	kmem_free(mg, sizeof (metaslab_group_t));