From owner-svn-src-head@freebsd.org Mon Oct 12 16:02:11 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 67783A1170A; Mon, 12 Oct 2015 16:02:11 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 22DCD1F6C; Mon, 12 Oct 2015 16:02:11 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.84 (FreeBSD)) (envelope-from ) id 1ZlfY7-000KsK-Dl; Mon, 12 Oct 2015 19:02:07 +0300 Date: Mon, 12 Oct 2015 19:02:07 +0300 From: Slawa Olhovchenkov To: Alexander Motin Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r289191 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <20151012160207.GD42243@zxy.spb.ru> References: <201510121544.t9CFiiC9044351@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201510121544.t9CFiiC9044351@repo.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Oct 2015 16:02:11 -0000 On Mon, Oct 12, 2015 at 03:44:44PM +0000, Alexander Motin wrote: > Author: mav > Date: Mon Oct 12 15:44:44 2015 > New Revision: 289191 > URL: https://svnweb.freebsd.org/changeset/base/289191 > > Log: > MFV r289187: 6251 add tunable to disable free_bpobj processing Still need FreeBSD-specific code to control this tunable? > Reviewed by: Matthew Ahrens > Reviewed by: Prakash Surya > Reviewed by: Simon Klinkert > Reviewed by: Richard Elling > Reviewed by: Albert Lee > Reviewed by: Xin Li > Approved by: Garrett D'Amore > Author: George Wilson > > illumos/illumos-gate@139510fb6efa97dbe5f5479594b308d940cab8d1 > > Modified: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c > Directory Properties: > head/sys/cddl/contrib/opensolaris/ (props changed) > > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c > ============================================================================== > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Mon Oct 12 15:39:03 2015 (r289190) > +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Mon Oct 12 15:44:44 2015 (r289191) > @@ -20,7 +20,7 @@ > */ > /* > * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. > - * Copyright (c) 2011, 2014 by Delphix. All rights reserved. > + * Copyright (c) 2011, 2015 by Delphix. All rights reserved. > */ > > #include > @@ -102,6 +102,11 @@ SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, free_ma > > extern int zfs_txg_timeout; > > +/* > + * Enable/disable the processing of the free_bpobj object. > + */ > +boolean_t zfs_free_bpobj_enabled = B_TRUE; > + > /* the order has to match pool_scan_type */ > static scan_cb_t *scan_funcs[POOL_SCAN_FUNCS] = { > NULL, > @@ -1451,7 +1456,8 @@ dsl_scan_sync(dsl_pool_t *dp, dmu_tx_t * > * have to worry about traversing it. It is also faster to free the > * blocks than to scrub them. > */ > - if (spa_version(dp->dp_spa) >= SPA_VERSION_DEADLISTS) { > + if (zfs_free_bpobj_enabled && > + spa_version(dp->dp_spa) >= SPA_VERSION_DEADLISTS) { > scn->scn_is_bptree = B_FALSE; > scn->scn_zio_root = zio_root(dp->dp_spa, NULL, > NULL, ZIO_FLAG_MUSTSUCCEED); > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"