[Midnightbsd-cvs] src [8117] trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: sanity checks tweaked per freebsd svn rev 240957

[laffer1 at midnightbsd.org]

Revision: 8117
          http://svnweb.midnightbsd.org/src/?rev=8117
Author:   laffer1
Date:     2016-09-16 17:36:18 -0400 (Fri, 16 Sep 2016)
Log Message:
-----------
sanity checks tweaked per freebsd svn rev 240957

Revision Links:
--------------
    http://svnweb.midnightbsd.org/src/?rev=240957

Modified Paths:
--------------
    trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
    trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c	2016-09-16 20:35:02 UTC (rev 8116)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c	2016-09-16 21:36:18 UTC (rev 8117)
@@ -67,7 +67,6 @@
 boolean_t zfs_no_scrub_io = B_FALSE; /* set to disable scrub i/o */
 boolean_t zfs_no_scrub_prefetch = B_FALSE; /* set to disable srub prefetching */
 enum ddt_class zfs_scrub_ddt_class_max = DDT_CLASS_DUPLICATE;
-int dsl_scan_delay_completion = B_FALSE; /* set to delay scan completion */
 
 #define	DSL_SCAN_IS_SCRUB_RESILVER(scn) \
 	((scn)->scn_phys.scn_func == POOL_SCAN_SCRUB || \

Modified: trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
===================================================================
--- trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c	2016-09-16 20:35:02 UTC (rev 8116)
+++ trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c	2016-09-16 21:36:18 UTC (rev 8117)
@@ -166,7 +166,6 @@
 void
 space_map_remove(space_map_t *sm, uint64_t start, uint64_t size)
 {
-	avl_index_t where;
 	space_seg_t ssearch, *ss, *newseg;
 	uint64_t end = start + size;
 	int left_over, right_over;
@@ -178,7 +177,7 @@
 
 	ssearch.ss_start = start;
 	ssearch.ss_end = end;
-	ss = avl_find(&sm->sm_root, &ssearch, &where);
+	ss = avl_find(&sm->sm_root, &ssearch, NULL);
 
 	/* Make sure we completely overlap with someone */
 	if (ss == NULL) {
@@ -189,7 +188,7 @@
 	}
 	VERIFY3U(ss->ss_start, <=, start);
 	VERIFY3U(ss->ss_end, >=, end);
-	VERIFY(sm->sm_space - size <= sm->sm_size);
+	VERIFY(sm->sm_space - size < sm->sm_size);
 
 	left_over = (ss->ss_start != start);
 	right_over = (ss->ss_end != end);