svn commit: r331712 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/cmd/ztest

[Alexander Motin]

Author: mav
Date: Wed Mar 28 23:12:03 2018
New Revision: 331712
URL: https://svnweb.freebsd.org/changeset/base/331712

Log:
  9280 Assertion failure while running removal_with_ganging test with 4K devices
  
  illumos/illumos-gate at 243952c7eeef020886e3e2e3df99a513df40584a
  
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Reviewed by: John Kennedy <john.kennedy at delphix.com>
  Approved by: Garrett D'Amore <garrett at damore.org>
  Author: Matt Ahrens <Matt.Ahrens at delphix.com>

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/metaslab.c

Changes in other areas also in this revision:
Modified:
  vendor/illumos/dist/cmd/ztest/ztest.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/metaslab.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/metaslab.c	Wed Mar 28 23:05:48 2018	(r331711)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/metaslab.c	Wed Mar 28 23:12:03 2018	(r331712)
@@ -41,7 +41,7 @@
 	((flags) & (METASLAB_GANG_CHILD | METASLAB_GANG_HEADER))
 
 uint64_t metaslab_aliquot = 512ULL << 10;
-uint64_t metaslab_gang_bang = SPA_MAXBLOCKSIZE + 1;	/* force gang blocks */
+uint64_t metaslab_force_ganging = SPA_MAXBLOCKSIZE + 1;	/* force gang blocks */
 
 /*
  * Since we can touch multiple metaslabs (and their respective space maps)
@@ -3080,7 +3080,7 @@ metaslab_alloc_dva(spa_t *spa, metaslab_class_t *mc, u
 	/*
 	 * For testing, make some blocks above a certain size be gang blocks.
 	 */
-	if (psize >= metaslab_gang_bang && (ddi_get_lbolt() & 3) == 0) {
+	if (psize >= metaslab_force_ganging && (ddi_get_lbolt() & 3) == 0) {
 		metaslab_trace_add(zal, NULL, NULL, psize, d, TRACE_FORCE_GANG);
 		return (SET_ERROR(ENOSPC));
 	}