From dd4e2f99f0c72b2c96002013a753cda2dcdc1968 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Sat, 24 May 2025 17:08:01 +1000 Subject: [PATCH] tunables: remove unused param get/set aliases 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/linux/kernel/linux/mod_compat.h | 50 +++++++--------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/include/os/linux/kernel/linux/mod_compat.h b/include/os/linux/kernel/linux/mod_compat.h index 10fb8b840..78b874852 100644 --- a/include/os/linux/kernel/linux/mod_compat.h +++ b/include/os/linux/kernel/linux/mod_compat.h @@ -79,43 +79,23 @@ enum scope_prefix_types { }; /* - * While we define our own u64 types, there is no reason to reimplement the - * existing Linux kernel types, so we use the preprocessor to remap our - * "custom" implementations to the kernel ones. This is done because the CPP - * does not allow us to write conditional definitions. The fourth definition - * exists because the CPP will not allow us to replace things like INT with int - * before string concatenation. + * Our uint64 params are called U64 in part because we had them before Linux + * provided ULLONG param ops. Now it does, and we use them, but we retain the + * U64 name to keep many existing tunables working without issue. */ +#define spl_param_set_u64 param_set_ullong +#define spl_param_get_u64 param_get_ullong +#define spl_param_ops_U64 param_ops_ullong -#define spl_param_set_int param_set_int -#define spl_param_get_int param_get_int -#define spl_param_ops_int param_ops_int -#define spl_param_ops_INT param_ops_int - -#define spl_param_set_long param_set_long -#define spl_param_get_long param_get_long -#define spl_param_ops_long param_ops_long -#define spl_param_ops_LONG param_ops_long - -#define spl_param_set_uint param_set_uint -#define spl_param_get_uint param_get_uint -#define spl_param_ops_uint param_ops_uint -#define spl_param_ops_UINT param_ops_uint - -#define spl_param_set_ulong param_set_ulong -#define spl_param_get_ulong param_get_ulong -#define spl_param_ops_ulong param_ops_ulong -#define spl_param_ops_ULONG param_ops_ulong - -#define spl_param_set_u64 param_set_ullong -#define spl_param_get_u64 param_get_ullong -#define spl_param_ops_u64 param_ops_ullong -#define spl_param_ops_U64 param_ops_ullong - -#define spl_param_set_charp param_set_charp -#define spl_param_get_charp param_get_charp -#define spl_param_ops_charp param_ops_charp -#define spl_param_ops_STRING param_ops_charp +/* + * We keep our own names for param ops to make expanding them in + * ZFS_MODULE_PARAM easy. + */ +#define spl_param_ops_INT param_ops_int +#define spl_param_ops_LONG param_ops_long +#define spl_param_ops_UINT param_ops_uint +#define spl_param_ops_ULONG param_ops_ulong +#define spl_param_ops_STRING param_ops_charp /* * Declare a module parameter / sysctl node