diff options
author | Martin Matuska <mm@FreeBSD.org> | 2022-05-18 22:54:40 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2022-05-18 22:55:59 +0000 |
commit | 716fd348e01c5f2ba125f878a634a753436c2994 (patch) | |
tree | 0d738baf7a9ccfd90fa1e622f67e0399f306f024 /sys/contrib/openzfs/tests/zfs-tests/tests/functional/fallocate/setup.ksh | |
parent | 4e2d3f26bd12610ef8672eefb02814b882a4c29b (diff) | |
parent | c0cf6ed6792e545fd614c2a88cb53756db7e03f8 (diff) | |
download | src-716fd348e01c5f2ba125f878a634a753436c2994.tar.gz src-716fd348e01c5f2ba125f878a634a753436c2994.zip |
zfs: merge openzfs/zfs@c0cf6ed67
Notable upstream pull request merges:
#10662 zvol_wait: Ignore locked zvols
#12789 Improve log spacemap load time
#12812 Improved zpool status output, list all affected datasets
#13277 FreeBSD: Use NDFREE_PNBUF if available
#13302 Make zfs_max_recordsize default to 16M
#13311 Fix error handling in FreeBSD's get/putpages VOPs
#13345 FreeBSD: Fix translation from ABD to physical pages
#13373 zfs: holds: dequadratify
#13375 Corrected edge case in uncompressed ARC->L2ARC handling
#13388 Improve mg_aliquot math
#13405 Reduce dbuf_find() lock contention
#13406 FreeBSD: use zero_region instead of allocating a dedicated page
Obtained from: OpenZFS
OpenZFS commit: c0cf6ed6792e545fd614c2a88cb53756db7e03f8
Diffstat (limited to 'sys/contrib/openzfs/tests/zfs-tests/tests/functional/fallocate/setup.ksh')
-rwxr-xr-x | sys/contrib/openzfs/tests/zfs-tests/tests/functional/fallocate/setup.ksh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fallocate/setup.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fallocate/setup.ksh index 32334d396865..586ac026aa43 100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fallocate/setup.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fallocate/setup.ksh @@ -26,4 +26,7 @@ . $STF_SUITE/include/libtest.shlib DISK=${DISKS%% *} -default_setup $DISK +default_setup_noexit $DISK +log_must zfs set compression=off $TESTPOOL +log_pass + |