diff options
| author | delphij <delphij@FreeBSD.org> | 2013-09-10 01:46:47 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-09-10 01:46:47 +0000 |
| commit | a23043347caa65ac4c8e91f806ab2319dbbd657c (patch) | |
| tree | 0687bff9ba2d5136268f4e5308ff47b239b85978 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c | |
| parent | 545d815a3b9493ec2dee3f291049b47655c1ec46 (diff) | |
| download | FreeBSD-src-a23043347caa65ac4c8e91f806ab2319dbbd657c.zip FreeBSD-src-a23043347caa65ac4c8e91f806ab2319dbbd657c.tar.gz | |
MFV r247844 (illumos-gate 13975:ef6409bc370f)
Illumos ZFS issues:
3582 zfs_delay() should support a variable resolution
3584 DTrace sdt probes for ZFS txg states
Provide a compatibility shim for Solaris's cv_timedwait_hires
to help aid future porting.
Approved by: re (ZFS blanket)
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c index 4c86f9c..123fb32 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c @@ -744,7 +744,8 @@ dsl_dir_tempreserve_space(dsl_dir_t *dd, uint64_t lsize, uint64_t asize, err = dsl_pool_tempreserve_space(dd->dd_pool, asize, tx); } else { if (err == EAGAIN) { - txg_delay(dd->dd_pool, tx->tx_txg, 1); + txg_delay(dd->dd_pool, tx->tx_txg, + MSEC2NSEC(10), MSEC2NSEC(10)); err = SET_ERROR(ERESTART); } dsl_pool_memory_pressure(dd->dd_pool); |
