punch holes in loopbacks

Signed-off-by: Paul Dagnelie <[email protected]>

Author: Paul Dagnelie

tests/zfs-tests/include/libtest.shlib

@@ -789,6 +789,23 @@ function assert
 	(($@)) || log_fail "$@"
 }
 
+function get_file_size
+{
+       typeset filename="$1"
+
+       if is_linux; then
+	       if [ -b "$filename" ] ; then
+		       filesize=$(blockdev --getsize64 $filename)
+	       else
+		       filesize=$(stat -c %s $filename)
+	       fi
+       else
+	       filesize=$(stat -s $filename | awk '{print $8}' | grep -o '[0-9]\+')
+       fi
+
+       echo $filesize
+}
+
 #
 # Function to format partition size of a disk
 # Given a disk cxtxdx reduces all partitions
@@ -1599,6 +1616,14 @@ function create_pool #pool devs_list
 
 	if is_global_zone ; then
 		[[ -d /$pool ]] && rm -rf /$pool
+
+		for vdev in "$@" ; do
+		       if [[ "$vdev" =~ "loop" ]] ; then
+			       # If the device is a loopback, remove previously
+			       # allocated data.
+			       punch_hole 0 $(get_file_size /dev/$vdev) /dev/$vdev
+		       fi
+	       done
 		log_must zpool create -f $pool $@
 	fi
 

tests/zfs-tests/tests/functional/anyraid/anyraid_common.kshlib

@@ -46,8 +46,7 @@ function wipe_some_disks_and_verify_content_is_still_okay
 	done
 
 	for disk in $@; do
-		log_must dd if=/dev/zero of=$disk seek=8 bs=$DD_BLOCK \
-			count=$(( DD_COUNT - 128 )) conv=notrunc
+		log_must punch_hole $((DD_BLOCK * 8)) $((DD_BLOCK * (DD_COUNT - 128))) $disk
 	done
 
 	#

tests/zfs-tests/tests/functional/direct/dio.kshlib

@@ -261,19 +261,6 @@ function check_read # pool file bs count skip flags buf_rd dio_rd
 	fi
 }
 
-function get_file_size
-{
-	typeset filename="$1"
-
-	if is_linux; then
-		filesize=$(stat -c %s $filename)
-	else
-		filesize=$(stat -s $filename | awk '{print $8}' | grep -o '[0-9]\+')
-	fi
-
-	echo $filesize
-}
-
 function do_truncate_reduce
 {
 	typeset filename=$1