From 7b183f1918f53fd722e11f7adde9d928860eaf4e Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Sat, 24 May 2025 16:24:42 +1000 Subject: [PATCH] tunables: remove FreeBSD compat macros for Linux module params Nothing in any FreeBSD code uses them. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Reviewed-by: Pavel Snajdr Signed-off-by: Rob Norris Closes #17377 --- include/os/freebsd/spl/sys/ccompile.h | 5 +---- module/os/freebsd/zfs/zio_crypt.c | 6 ------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/include/os/freebsd/spl/sys/ccompile.h b/include/os/freebsd/spl/sys/ccompile.h index 112f7bc32..51238dd1c 100644 --- a/include/os/freebsd/spl/sys/ccompile.h +++ b/include/os/freebsd/spl/sys/ccompile.h @@ -43,10 +43,7 @@ extern "C" { #endif #define EXPORT_SYMBOL(x) -#define module_param(a, b, c) -#define module_param_call(a, b, c, d, e) -#define module_param_named(a, b, c, d) -#define MODULE_PARM_DESC(a, b) + #define asm __asm #ifdef ZFS_DEBUG #undef NDEBUG diff --git a/module/os/freebsd/zfs/zio_crypt.c b/module/os/freebsd/zfs/zio_crypt.c index 5a2c4b8cb..91cf38016 100644 --- a/module/os/freebsd/zfs/zio_crypt.c +++ b/module/os/freebsd/zfs/zio_crypt.c @@ -1822,9 +1822,3 @@ error: return (SET_ERROR(ret)); } - -#if defined(_KERNEL) && defined(HAVE_SPL) -module_param(zfs_key_max_salt_uses, ulong, 0644); -MODULE_PARM_DESC(zfs_key_max_salt_uses, "Max number of times a salt value " - "can be used for generating encryption keys before it is rotated"); -#endif