diff options
| author | Matthew Ahrens <mahrens@delphix.com> | 2013-12-12 09:17:22 -0800 |
|---|---|---|
| committer | Christopher Siden <chris.siden@delphix.com> | 2013-12-12 09:17:22 -0800 |
| commit | 8b36997aa24d9817807faa4efa301ac9c07a2b78 (patch) | |
| tree | 35d0cbdd6f8f1b75ec680c6ebd89c306e0aa6cbf /usr/src/uts/common/fs/zfs/dsl_scan.c | |
| parent | 78f171005391b928aaf1642b3206c534ed644332 (diff) | |
| download | illumos-joyent-8b36997aa24d9817807faa4efa301ac9c07a2b78.tar.gz | |
4391 panic system rather than corrupting pool if we hit bug 4390
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/dsl_scan.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_scan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_scan.c b/usr/src/uts/common/fs/zfs/dsl_scan.c index ee8f65cf7a..f5e2ea825d 100644 --- a/usr/src/uts/common/fs/zfs/dsl_scan.c +++ b/usr/src/uts/common/fs/zfs/dsl_scan.c @@ -1317,6 +1317,9 @@ dsl_scan_free_should_pause(dsl_scan_t *scn) { uint64_t elapsed_nanosecs; + if (zfs_recover) + return (B_FALSE); + elapsed_nanosecs = gethrtime() - scn->scn_sync_start_time; return (elapsed_nanosecs / NANOSEC > zfs_txg_timeout || (NSEC2MSEC(elapsed_nanosecs) > zfs_free_min_time_ms && |