Tony feedback

Signed-off-by: Paul Dagnelie <paul.dagnelie@klarasystems.com>

Author: Paul Dagnelie

cmd/zdb/zdb.c

@@ -9437,7 +9437,7 @@ dummy_get_file_info(dmu_object_type_t bonustype, const void *data,
 }
 
 static int
-log_10(uint64_t v) {
+numlen(uint64_t v) {
 	char buf[32];
 	snprintf(buf, sizeof (buf), "%llu", (u_longlong_t)v);
 	return (strlen(buf));
@@ -9497,8 +9497,8 @@ zdb_print_anyraid_tile_layout(vdev_t *vd)
 	ASSERT3P(vd->vdev_ops, ==, &vdev_anyraid_ops);
 	vdev_anyraid_t *var = vd->vdev_tsd;
 	int cols = vd->vdev_children;
-	int textwidth = MAX(8, log_10(avl_numnodes(&var->vd_tile_map)) +
-	    var->vd_nparity > 0 ? log_10(var->vd_nparity + 1) + 1 : 0);
+	int textwidth = MAX(8, numlen(avl_numnodes(&var->vd_tile_map)) +
+	    var->vd_nparity > 0 ? numlen(var->vd_nparity + 1) + 1 : 0);
 	int colwidth = textwidth + 2;
 
 	// Create and populate table with all the values we need to print.

include/sys/fs/zfs.h

@@ -910,7 +910,7 @@ typedef struct zpool_load_policy {
 #define	ZPOOL_CONFIG_DRAID_NGROUPS	"draid_ngroups"
 
 /* ANYRAID configuration */
-#define	ZPOOL_CONFIG_ANYRAID_PARITY_TYPE	"parity_type"
+#define	ZPOOL_CONFIG_ANYRAID_PARITY_TYPE	"anyraid_parity_type"
 
 #define	VDEV_TYPE_ROOT			"root"
 #define	VDEV_TYPE_MIRROR		"mirror"

tests/runfiles/sanity.run

@@ -269,12 +269,11 @@ tests = ['zpool_create_001_pos', 'zpool_create_002_pos',
     'zpool_create_012_neg', 'zpool_create_014_neg', 'zpool_create_015_neg',
     'zpool_create_017_neg', 'zpool_create_018_pos', 'zpool_create_019_pos',
     'zpool_create_020_pos', 'zpool_create_021_pos', 'zpool_create_022_pos',
-    'zpool_create_anyraid_001_pos', 'zpool_create_anyraid_002_pos',
-    'zpool_create_anyraid_003_pos', 'zpool_create_anyraid_004_pos',
-    'zpool_create_anyraid_005_neg', 'zpool_create_encrypted',
-    'zpool_create_features_001_pos', 'zpool_create_features_002_pos',
-    'zpool_create_features_003_pos', 'zpool_create_features_004_neg',
-    'zpool_create_features_005_pos']
+    'zpool_create_anyraid_001_pos', 'zpool_create_anyraid_003_pos',
+    'zpool_create_anyraid_004_pos', 'zpool_create_anyraid_005_neg',
+    'zpool_create_encrypted', 'zpool_create_features_001_pos',
+    'zpool_create_features_002_pos', 'zpool_create_features_003_pos',
+    'zpool_create_features_004_neg', 'zpool_create_features_005_pos']
 tags = ['functional', 'cli_root', 'zpool_create']
 
 [tests/functional/cli_root/zpool_destroy]

tests/zfs-tests/include/libtest.shlib

@@ -1856,7 +1856,7 @@ function verify_pool
 function get_disklist # pool
 {
 	echo $(zpool iostat -v $1 | awk '(NR > 4) {print $1}' | \
-	    grep -vEe '^-----' -e "^(mirror|raidz[1-3]|anyraid|draid[1-3]|spare|log|cache|special|dedup)|\-[0-9]$")
+	    grep -vEe '^-----' -e "^(mirror|raidz[1-3]|anymirror|draid[1-3]|spare|log|cache|special|dedup)|\-[0-9]$")
 }
 
 #

tests/zfs-tests/tests/functional/anyraid/anyraid_faildisk_write_replace_resilver.ksh

@@ -55,18 +55,18 @@ for replace_flags in '' '-s'; do
 
 	log_must create_sparse_files "disk" 3 $DEVSIZE
 	log_must create_sparse_files "spare" 1 $DEVSIZE
-	log_must zpool create -f $TESTPOOL anymirror1 $disks
+	log_must zpool create -O compress=off -f $TESTPOOL anymirror1 $disks
 	log_must zfs set primarycache=none $TESTPOOL
 
 	# Write initial data
-	log_must dd if=/dev/urandom of=/$TESTPOOL/file1.bin bs=1M count=$(( DEVSIZE / 2 / 1024 / 1024 ))
+	log_must file_write -o create -f /$TESTPOOL/file1.bin -b 1048576 -c 256 -d Z
 
 	# Fail one disk
 	log_must truncate -s0 $disk0
 
 	# Read initial data, write new data
-	dd if=/$TESTPOOL/file1.bin of=/dev/null bs=1M count=$(( DEVSIZE / 2 / 1024 / 1024 ))
-	log_must dd if=/dev/urandom of=/$TESTPOOL/file1.bin bs=1M count=$(( DEVSIZE / 2 / 1024 / 1024 ))
+	log_must dd if=/$TESTPOOL/file1.bin of=/dev/null bs=1M count=256
+	log_must file_write -o create -f /$TESTPOOL/file1.bin -b 1048576 -c 256 -d Y
 
 	# Check that disk is faulted
 	zpool status

tests/zfs-tests/tests/functional/anyraid/anyraid_special_vdev_001_pos.ksh

@@ -56,15 +56,20 @@ typeset newcksum
 for parity in {0..3}; do
 	log_must zpool create -f $TESTPOOL anymirror$parity $disks special mirror $sdisks
 	log_must poolexists $TESTPOOL
+	log_must zfs set special_small_blocks=4k $TESTPOOL
 
-	log_must dd if=/dev/urandom of=/$TESTPOOL/file.bin bs=1M count=128
+	log_must dd if=/dev/urandom of=/$TESTPOOL/file.bin bs=1M count=1
+	log_must dd if=/dev/urandom of=/$TESTPOOL/small.bin bs=4k count=1
 	oldcksum=$(xxh128digest /$TESTPOOL/file.bin)
+	oldsmallcksum=$(xxh128digest /$TESTPOOL/small.bin)
 	log_must zpool export $TESTPOOL
 
 	log_must zpool import -d $(dirname $disk0) $TESTPOOL
 	newcksum=$(xxh128digest /$TESTPOOL/file.bin)
+	newsmallcksum=$(xxh128digest /$TESTPOOL/small.bin)
 
 	log_must test "$oldcksum" = "$newcksum"
+	log_must test "$oldsmallcksum" = "$newsmallcksum"
 
 	log_must destroy_pool $TESTPOOL
 done

tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib

@@ -65,7 +65,7 @@ function setup_filesystem #disklist #pool #fs #mntpoint #type #vdev
 	if [[ $vdev != "" && \
 		$vdev != "mirror" && \
 		$vdev != "raidz" && \
-		$vdev != "anyraid" && \
+		$vdev != "anymirror" && \
 		$vdev != "draid" ]] ; then
 
 		log_note "Wrong vdev: (\"$vdev\")"

tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_009_neg.ksh

@@ -64,7 +64,7 @@ log_must poolexists $TESTPOOL
 
 log_mustnot zpool add -f $TESTPOOL $disk0
 
-for type in "" "mirror" "raidz" "anyraid" "draid" "spare" "log" "dedup" "special" "cache"
+for type in "" "mirror" "raidz" "anymirror" "draid" "spare" "log" "dedup" "special" "cache"
 do
 	log_mustnot zpool add -f $TESTPOOL $type $disk0 $disk1
 	log_mustnot zpool add --allow-in-use $TESTPOOL $type $disk0 $disk1

tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_007_neg.ksh

@@ -56,7 +56,7 @@ set -A args  "" "-?" "-n" "-f" "-nf" "-fn" "-f -n" "--f" "-e" "-s" \
 	"$TESTPOOL mirror" "$TESTPOOL raidz" "$TESTPOOL mirror raidz" \
 	"$TESTPOOL raidz1" "$TESTPOOL mirror raidz1" \
 	"$TESTPOOL draid1" "$TESTPOOL mirror draid1" \
-	"$TESTPOOL anyraid" "$TESTPOOL mirror anyraid" \
+	"$TESTPOOL anymirror" "$TESTPOOL mirror anymirror" \
 	"$TESTPOOL anymirror0" "$TESTPOOL mirror anymirror0" \
 	"$TESTPOOL anymirror1 $DISK0" \
 	"$TESTPOOL anymirror2 $DISK0 $DISK1" \

tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_anyraid_002_pos.ksh

@@ -44,8 +44,8 @@ function cleanup
 {
 	poolexists $TESTPOOL && destroy_pool $TESTPOOL
 
-	rm -f $all_vdevs
-	rmdir $TESTDIR
+	log_pos rm -f $all_vdevs
+	log_pos rmdir $TESTDIR
 }
 
 log_assert "'zpool create <pool> anyraid ...' can create a pool with maximum number of vdevs."