Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

maybe I can't reorder it that much

This commit is contained in:
Pavel Snajdr 2024-02-04 17:14:39 +01:00
parent 8299846620
commit 26818ada36
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
module/zfs/dsl_scan.c
View File

@ -4276,20 +4276,6 @@ dsl_scan_sync(dsl_pool_t *dp, dmu_tx_t *tx)
if (spa_sync_pass(spa) > 1) if (spa_sync_pass(spa) > 1)
return; return;
/*
* If the spa is shutting down, then stop scanning. This will
* ensure that the scan does not dirty any new data during the
* shutdown phase.
*/
if (spa_shutting_down(spa))
return;
/*
* If the scan is inactive due to a stalled async destroy, try again.
*/
if (!scn->scn_async_stalled && !dsl_scan_active(scn))
return;
/* /*
* issued/to_issue as presented to the user * issued/to_issue as presented to the user
* in print_scan_scrub_resilver_status() issued/total_i * in print_scan_scrub_resilver_status() issued/total_i
@ -4320,6 +4306,20 @@ dsl_scan_sync(dsl_pool_t *dp, dmu_tx_t *tx)
dsl_scan_setup_sync(&func, tx); dsl_scan_setup_sync(&func, tx);
} }
/*
* If the spa is shutting down, then stop scanning. This will
* ensure that the scan does not dirty any new data during the
* shutdown phase.
*/
if (spa_shutting_down(spa))
return;
/*
* If the scan is inactive due to a stalled async destroy, try again.
*/
if (!scn->scn_async_stalled && !dsl_scan_active(scn))
return;
/* reset scan statistics */ /* reset scan statistics */
scn->scn_visited_this_txg = 0; scn->scn_visited_this_txg = 0;
scn->scn_dedup_frees_this_txg = 0; scn->scn_dedup_frees_this_txg = 0;