Author: mav Date: Tue Jan 26 12:36:30 2016 New Revision: 294798 URL: https://svnweb.freebsd.org/changeset/base/294798
Log: 6292 exporting a pool while an async destroy is running can leave entries in the deferred tree Reviewed by: Paul Dagnelie <[email protected]> Reviewed by: Matthew Ahrens <[email protected]> Reviewed by: Andriy Gapon <[email protected]> Reviewed by: Fabian Keil <[email protected]> Approved by: Gordon Ross <[email protected]> illumos/illumos-gate@a443cc80c742af740aa82130db840f02b4389365 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c Tue Jan 26 12:33:58 2016 (r294797) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_scan.c Tue Jan 26 12:36:30 2016 (r294798) @@ -1413,10 +1413,23 @@ dsl_scan_sync(dsl_pool_t *dp, dmu_tx_t * } /* + * Only process scans in sync pass 1. + */ + if (spa_sync_pass(dp->dp_spa) > 1) + 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)) || - spa_sync_pass(dp->dp_spa) > 1) + if (!scn->scn_async_stalled && !dsl_scan_active(scn)) return; scn->scn_visited_this_txg = 0; _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "[email protected]"
