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.

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/45214
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Petros Koutoupis <petros.koutoupis@hpe.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 64ade1b..6442571 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -1717,6 +1717,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 <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
 # LIBCFS_PROG_LINUX
 #
 # LibCFS linux kernel checks


@@ -1846,6 +1864,8 @@ LIBCFS_SEC_RELEASE_SECCTX
 LIBCFS_HAVE_KFREE_SENSITIVE
 LIBCFS_HAVE_CRYPTO_SHA2_HEADER
 LIBCFS_HAVE_LIST_CMP_FUNC_T
 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
 
 #
 ]) # LIBCFS_PROG_LINUX
 
 #

diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c
index 32090f2..d3b77af 100644 (file)
--- a/libcfs/libcfs/debug.c
+++ b/libcfs/libcfs/debug.c
@@ -188,6 +188,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)");
 
 #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)
 static int param_set_uint_minmax(const char *val,
                                 cfs_kernel_param_arg_t *kp,
                                 unsigned int min, unsigned int max)


@@ -205,6 +206,7 @@ static int param_set_uint_minmax(const char *val,
        *((unsigned int *)kp->arg) = num;
        return 0;
 }
        *((unsigned int *)kp->arg) = num;
        return 0;
 }

+#endif

 
 static int param_set_uintpos(const char *val,
                             cfs_kernel_param_arg_t *kp)
 
 static int param_set_uintpos(const char *val,
                             cfs_kernel_param_arg_t *kp)