Author: mav
Date: Wed Feb 26 16:04:24 2020
New Revision: 358340
URL: https://svnweb.freebsd.org/changeset/base/358340
Log:
Fix patch mismerge in r358336.
MFC after: 1 week
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 Wed Feb
26 15:59:46 2020 (r358339)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Wed Feb
26 16:04:24 2020 (r358340)
@@ -3681,8 +3681,6 @@ dsl_scan_scrub_done(zio_t *zio)
abd_free(zio->io_abd);
- ASSERT3U(scn->scn_maxinflight_bytes, >, 0);
-
if (queue == NULL) {
mutex_enter(&spa->spa_scrub_lock);
ASSERT3U(spa->spa_scrub_inflight, >=, BP_GET_PSIZE(bp));
@@ -3719,6 +3717,8 @@ scan_exec_io(dsl_pool_t *dp, const blkptr_t *bp, int z
size_t size = BP_GET_PSIZE(bp);
abd_t *data = abd_alloc_for_io(size, B_FALSE);
unsigned int scan_delay = 0;
+
+ ASSERT3U(scn->scn_maxinflight_bytes, >, 0);
if (queue == NULL) {
mutex_enter(&spa->spa_scrub_lock);
_______________________________________________
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-unsubscr...@freebsd.org"
