diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index 5d43750594..a6b704ec87 100644 --- a/include/sys/fs/zfs.h +++ b/include/sys/fs/zfs.h @@ -1225,7 +1225,7 @@ typedef struct ddt_histogram { #define ZVOL_DEV_NAME "zd" #define ZVOL_PROP_NAME "name" -#define ZVOL_DEFAULT_BLOCKSIZE 8192 +#define ZVOL_DEFAULT_BLOCKSIZE 16384 typedef enum { VDEV_INITIALIZE_NONE, diff --git a/man/man7/zfsprops.7 b/man/man7/zfsprops.7 index 3f3ddcebf3..fcf086f0c2 100644 --- a/man/man7/zfsprops.7 +++ b/man/man7/zfsprops.7 @@ -527,7 +527,7 @@ cannot be changed once the volume has been written, so it should be set at volume creation time. The default .Sy blocksize -for volumes is 8 Kbytes. +for volumes is 16 Kbytes. Any power of 2 from 512 bytes to 128 Kbytes is valid. .Pp This property can also be referred to by its shortened column name, diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create.cfg b/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create.cfg index 9bf25327ef..785d5a0016 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create.cfg +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create.cfg @@ -62,4 +62,4 @@ set -A size "8k" "8K" "35K" "1m" "1M" "1mb" "1mB" "1Mb" "1MB" "1g" "1G" \ # explicitly check that its size has been rounded up to the nearest multiple # The volume with the exact size must exist in the "size" array above set -A explicit_size_check "35K" -set -A expected_rounded_size "40960" +set -A expected_rounded_size "49152" diff --git a/tests/zfs-tests/tests/functional/nopwrite/nopwrite_volume.ksh b/tests/zfs-tests/tests/functional/nopwrite/nopwrite_volume.ksh index a118b98224..66ac29277e 100755 --- a/tests/zfs-tests/tests/functional/nopwrite/nopwrite_volume.ksh +++ b/tests/zfs-tests/tests/functional/nopwrite/nopwrite_volume.ksh @@ -45,14 +45,14 @@ log_assert "nopwrite works on volumes" log_must zfs set compress=on $origin log_must zfs set checksum=sha256 $origin -dd if=/dev/urandom of=$vol bs=8192 count=4096 conv=notrunc >/dev/null \ +dd if=/dev/urandom of=$vol bs=16384 count=2048 conv=notrunc >/dev/null \ 2>&1 || log_fail "dd into $origin failed." zfs snapshot $origin@a || log_fail "zfs snap failed" log_must zfs clone $origin@a $clone log_must zfs set compress=on $clone log_must zfs set checksum=sha256 $clone block_device_wait -dd if=$vol of=$volclone bs=8192 count=4096 conv=notrunc >/dev/null 2>&1 || \ +dd if=$vol of=$volclone bs=16384 count=2048 conv=notrunc >/dev/null 2>&1 || \ log_fail "dd into $clone failed." log_must verify_nopwrite $origin $origin@a $clone diff --git a/tests/zfs-tests/tests/functional/reservation/reservation.shlib b/tests/zfs-tests/tests/functional/reservation/reservation.shlib index 49ee3b992d..47bd70f7cb 100644 --- a/tests/zfs-tests/tests/functional/reservation/reservation.shlib +++ b/tests/zfs-tests/tests/functional/reservation/reservation.shlib @@ -108,7 +108,7 @@ function create_multiple_fs # num_fs base_fs_name base_mnt_name # # This function compute the largest volume size which is multiple of volume -# block size (default 8K) and not greater than the largest expected volsize. +# block size (default 16K) and not greater than the largest expected volsize. # # $1 The largest expected volume size. # $2 The volume block size @@ -116,7 +116,7 @@ function create_multiple_fs # num_fs base_fs_name base_mnt_name function floor_volsize # [volblksize] { typeset largest_volsize=$1 - typeset volblksize=${2:-8192} + typeset volblksize=${2:-16384} if ((largest_volsize < volblksize)); then log_fail "The largest_volsize must be greater than volblksize." @@ -157,7 +157,7 @@ function volsize_to_reservation typeset volblocksize=$(get_prop volblocksize $vol) else typeset ncopies=1 - typeset volblocksize=8192 + typeset volblocksize=16384 fi typeset nblocks=$((volsize / volblocksize))