c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-25 19:57:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: Add helper for disk device check

Browse Source 
Replace `test -b` and equivalents with `is_disk_device`, so that `-c`
is used instead on FreeBSD which has no block cache layer for devices.

Reviewed-by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
Closes #9795
This commit is contained in:
Ryan Moeller
2020-01-03 12:10:17 -05:00
committed by Brian Behlendorf
parent d7164b27be
commit 665684d721
7 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/trim/setup.ksh
+1 -1
View File
@@ -30,7 +30,7 @@ else
DISK1=${DISKS%% *}
typeset -i max_discard=0
if [[ -b $DEV_RDSKDIR/$DISK1 ]]; then
if is_disk_device $DEV_RDSKDIR/$DISK1; then
max_discard=$(lsblk -Dbn $DEV_RDSKDIR/$DISK1 | awk '{ print $4; exit }')
fi