svn commit: r339135 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Alexander Motin mav at FreeBSD.org
Wed Oct 3 14:51:17 UTC 2018


Author: mav
Date: Wed Oct  3 14:51:16 2018
New Revision: 339135
URL: https://svnweb.freebsd.org/changeset/base/339135

Log:
  MFC r337201: Fix build after r337196 mismerge.

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c	Wed Oct  3 14:50:40 2018	(r339134)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c	Wed Oct  3 14:51:16 2018	(r339135)
@@ -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-all mailing list