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: 3337e9fe920b260e34ff62c0840279ea6bff34ca

HPE-bug-id: LUS-10469
Test-Parameters: trivial
Signed-off-by: Chris Horn <chris.horn@hpe.com>
Change-Id: Ifd1d72ae531f0f6c7cd96cc28fbc07c8a8b70886
Reviewed-on: https://review.whamcloud.com/47383
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Gian-Carlo DeFazio <defazio1@llnl.gov>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 8646205..4b40e3e 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -1259,6 +1259,24 @@ EXTRA_KCFLAGS="$tmp_flags"
 ]) # LIBCFS_HAVE_NR_UNSTABLE_NFS
 
 #
+# 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 <linux/moduleparam.h>
+],[
+       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
@@ -1372,6 +1390,8 @@ LIBCFS_GET_REQUEST_KEY_AUTH
 LIBCFS_LOOKUP_USER_KEY
 LIBCFS_CACHE_DETAIL_WRITERS
 LIBCFS_HAVE_NR_UNSTABLE_NFS
+# 5.15
+LIBCFS_PARAM_SET_UINT_MINMAX
 ]) # LIBCFS_PROG_LINUX
 
 #

diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c
index 0f7d619..65e5b46 100644 (file)
--- a/libcfs/libcfs/debug.c
+++ b/libcfs/libcfs/debug.c
@@ -200,6 +200,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)
@@ -217,6 +218,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)