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

Alexander Motin mav at FreeBSD.org
Thu Aug 2 23:40:29 UTC 2018


Author: mav
Date: Thu Aug  2 23:40:28 2018
New Revision: 337201
URL: https://svnweb.freebsd.org/changeset/base/337201

Log:
  Fix build after r337196 mismerge.

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c

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	Thu Aug  2 23:37:26 2018	(r337200)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c	Thu Aug  2 23:40:28 2018	(r337201)
@@ -3552,7 +3552,7 @@ dsl_scan_scrub_cb(dsl_pool_t *dp,
 	int zio_flags = ZIO_FLAG_SCAN_THREAD | ZIO_FLAG_RAW | ZIO_FLAG_CANFAIL;
 	int d;
 	
-	count_block(dp->dp_blkstats, bp);
+	count_block(scn, dp->dp_blkstats, bp);
 
 	if (phys_birth <= scn->scn_phys.scn_min_txg ||
 	    phys_birth >= scn->scn_phys.scn_max_txg)


More information about the svn-src-head mailing list