upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix patch mismerge in r358336.

Browse source 
MFC after:	1 week
This commit is contained in:
Alexander Motin 2020-02-26 16:04:24 +00:00
parent f8a7a04b79
commit 51c04e6cc2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
View file

@ -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));
@ -3720,6 +3718,8 @@ scan_exec_io(dsl_pool_t *dp, const blkptr_t *bp, int zio_flags,
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);
while (spa->spa_scrub_inflight >= scn->scn_maxinflight_bytes)