From 46f3b3f459b5086b0210e7089175a0d387027e03 Mon Sep 17 00:00:00 2001 From: Rich Ercolani Date: Thu, 16 Nov 2023 05:41:47 -0500 Subject: [PATCH] Modified the default to 1 for master Signed-off-by: Rich Ercolani --- man/man4/zfs.4 | 2 +- module/os/freebsd/zfs/zfs_vfsops.c | 3 ++- module/os/linux/zfs/zpl_file_range.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/man/man4/zfs.4 b/man/man4/zfs.4 index 95f271bfcac9..5daf27e9d536 100644 --- a/man/man4/zfs.4 +++ b/man/man4/zfs.4 @@ -1154,7 +1154,7 @@ Selecting any option other than results in vector instructions from the respective CPU instruction set being used. . -.It Sy zfs_bclone_enabled Ns = Ns Sy 0 Ns | Ns 1 Pq int +.It Sy zfs_bclone_enabled Ns = Ns Sy 1 Ns | Ns 0 Pq int Enable the experimental block cloning feature. If this setting is 0, then even if feature@block_cloning is enabled, attempts to clone blocks will act as though the feature is disabled. diff --git a/module/os/freebsd/zfs/zfs_vfsops.c b/module/os/freebsd/zfs/zfs_vfsops.c index 74f18f40c612..291dab0d926f 100644 --- a/module/os/freebsd/zfs/zfs_vfsops.c +++ b/module/os/freebsd/zfs/zfs_vfsops.c @@ -89,10 +89,11 @@ int zfs_debug_level; SYSCTL_INT(_vfs_zfs, OID_AUTO, debug, CTLFLAG_RWTUN, &zfs_debug_level, 0, "Debug level"); -int zfs_bclone_enabled; +int zfs_bclone_enabled = 1; SYSCTL_INT(_vfs_zfs, OID_AUTO, bclone_enabled, CTLFLAG_RWTUN, &zfs_bclone_enabled, 0, "Enable block cloning"); + struct zfs_jailparam { int mount_snapshot; }; diff --git a/module/os/linux/zfs/zpl_file_range.c b/module/os/linux/zfs/zpl_file_range.c index 139c51cf46df..73476ff40ebf 100644 --- a/module/os/linux/zfs/zpl_file_range.c +++ b/module/os/linux/zfs/zpl_file_range.c @@ -31,7 +31,7 @@ #include #include -int zfs_bclone_enabled = 0; +int zfs_bclone_enabled = 1; /* * Clone part of a file via block cloning.