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/truncate/truncate.cfg | |
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/truncate/truncate.cfg')
-rw-r--r-- | sys/contrib/openzfs/tests/zfs-tests/tests/functional/truncate/truncate.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/truncate/truncate.cfg b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/truncate/truncate.cfg index 13cdafab133b..d852ee63abb5 100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/truncate/truncate.cfg +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/truncate/truncate.cfg @@ -34,6 +34,6 @@ export TRUNC_FILEOFFSET=${TRUNC_FILEOFFSET-""} export TRUNC_COUNT=${TRUNC_COUNT-"16384"} # FILESIZE/BLKSIZE/8 export DISKSARRAY=$DISKS -export DISK_ARRAY_NUM=$(echo ${DISKS} | nawk '{print NF}') +export DISK_ARRAY_NUM=$(echo ${DISKS} | awk '{print NF}') set_device_dir |