svn commit: r289191 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Slawa Olhovchenkov]

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 <mahrens at delphix.com>
>   Reviewed by: Prakash Surya <prakash.surya at delphix.com>
>   Reviewed by: Simon Klinkert <simon.klinkert at gmail.com>
>   Reviewed by: Richard Elling <Richard.Elling at RichardElling.com>
>   Reviewed by: Albert Lee <trisk at omniti.com>
>   Reviewed by: Xin Li <delphij at freebsd.org>
>   Approved by: Garrett D'Amore <garrett at damore.org>
>   Author: George Wilson <george.wilson at delphix.com>
>   
>   illumos/illumos-gate at 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 <sys/dsl_scan.h>
> @@ -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 at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-all
> To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"