From owner-svn-src-stable@FreeBSD.ORG Wed Sep 26 11:12:10 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11CB5106564A; Wed, 26 Sep 2012 11:12:10 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D680B8FC08; Wed, 26 Sep 2012 11:12:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8QBC9Pt015948; Wed, 26 Sep 2012 11:12:09 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8QBC9EC015945; Wed, 26 Sep 2012 11:12:09 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201209261112.q8QBC9EC015945@svn.freebsd.org> From: Martin Matuska Date: Wed, 26 Sep 2012 11:12:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240958 - stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 11:12:10 -0000 Author: mm Date: Wed Sep 26 11:12:09 2012 New Revision: 240958 URL: http://svn.freebsd.org/changeset/base/240958 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/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/cddl/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Wed Sep 26 10:58:15 2012 (r240957) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Wed Sep 26 11:12:09 2012 (r240958) @@ -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/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c ============================================================================== --- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c Wed Sep 26 10:58:15 2012 (r240957) +++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c Wed Sep 26 11:12:09 2012 (r240958) @@ -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);