From b86c894875c74d47a37bbbc9a1c221b45fb46c91 Mon Sep 17 00:00:00 2001 From: Chris Horn Date: Mon, 27 Sep 2021 15:48:02 -0500 Subject: [PATCH] LU-15093 libcfs: Check if param_set_uint_minmax is provided Linux kernel v5.15 commit 2a14c9ae15a38148484a128b84bff7e9ffd90d68 moved param_set_uint_minmax to common code. Lustre-change: https://review.whamcloud.com/45214/ Lustre-commit: 8bc83a6a9e9558e78c11351f6698d06d29e3dac1 HPE-bug-id: LUS-10469 Test-Parameters: trivial Signed-off-by: Chris Horn Change-Id: Ifd1d72ae531f0f6c7cd96cc28fbc07c8a8b70886 Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/45324 Tested-by: jenkins Reviewed-by: Jian Yu Tested-by: Maloo Reviewed-by: Andreas Dilger --- libcfs/autoconf/lustre-libcfs.m4 | 20 ++++++++++++++++++++ libcfs/libcfs/debug.c | 2 ++ 2 files changed, 22 insertions(+) diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index 354c524..5eb478c 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -1586,6 +1586,24 @@ AC_DEFUN([LIBCFS_PROG_LINUX_RESULTS], [ ]) # +# LIBCFS_PARAM_SET_UINT_MINMAX +# +# Kernel 5.15-rc1 commit 2a14c9ae15a38148484a128b84bff7e9ffd90d68 +# moved param_set_uint_minmax to common code +# +AC_DEFUN([LIBCFS_PARAM_SET_UINT_MINMAX],[ +LB_CHECK_COMPILE([does function 'param_set_uint_minmax' exist], +param_set_uint_minmax, [ + #include +],[ + param_set_uint_minmax(NULL, NULL, 0, 0); +],[ + AC_DEFINE(HAVE_PARAM_SET_UINT_MINMAX, 1, + ['param_set_uint_minmax' is available]) +]) +]) # LIBCFS_PARAM_SET_UINT_MINMAX + +# # LIBCFS_PROG_LINUX # # LibCFS linux kernel checks @@ -1707,6 +1725,8 @@ LIBCFS_SEC_RELEASE_SECCTX LIBCFS_HAVE_KFREE_SENSITIVE LIBCFS_HAVE_CRYPTO_SHA2_HEADER LIBCFS_HAVE_LIST_CMP_FUNC_T +# 5.15 +LIBCFS_PARAM_SET_UINT_MINMAX ]) # LIBCFS_PROG_LINUX # diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c index 997f3bd..2f891d9 100644 --- a/libcfs/libcfs/debug.c +++ b/libcfs/libcfs/debug.c @@ -189,6 +189,7 @@ module_param_call(libcfs_console_min_delay, param_set_console_min_delay, #endif MODULE_PARM_DESC(libcfs_console_min_delay, "Lustre kernel debug console min delay (jiffies)"); +#ifndef HAVE_PARAM_SET_UINT_MINMAX static int param_set_uint_minmax(const char *val, cfs_kernel_param_arg_t *kp, unsigned int min, unsigned int max) @@ -206,6 +207,7 @@ static int param_set_uint_minmax(const char *val, *((unsigned int *)kp->arg) = num; return 0; } +#endif static int param_set_uintpos(const char *val, cfs_kernel_param_arg_t *kp) -- 1.8.3.1