Author: mm
Date: Wed Sep 26 10:58:15 2012
New Revision: 240957
URL: http://svn.freebsd.org/changeset/base/240957
Log:
MFC r236248-r236250:
MFC r236248 (pjd):
Remove unused variable.
MFC r236249 (pjd):
Eliminate 'where' argument, we don't use it.
MFC r236250 (pjd):
Tighten up the assertion: because size can't be 0 and even if sm_space is
equal
to sm_size, any 'sm_space - size' will be less than sm_size.
Modified:
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Wed Sep
26 10:07:53 2012 (r240956)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Wed Sep
26 10:58:15 2012 (r240957)
@@ -67,7 +67,6 @@ int zfs_resilver_min_time_ms = 3000; /*
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: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c Wed Sep
26 10:07:53 2012 (r240956)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c Wed Sep
26 10:58:15 2012 (r240957)
@@ -149,7 +149,6 @@ space_map_add(space_map_t *sm, uint64_t
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;
@@ -161,7 +160,7 @@ space_map_remove(space_map_t *sm, uint64
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) {
@@ -172,7 +171,7 @@ space_map_remove(space_map_t *sm, uint64
}
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);
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
