X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=227fd38ce39355abe713a0135d06eb5e7bb5a660;hp=625913ea42236904d8cbc0d69e51e7cd884e4c61;hb=74b3726f42b1f72e289e3c3252030a62646afa7b;hpb=ccf3674c9ca3ed8918c49163007708d1ae5db6f5

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 625913e..227fd38 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -266,23 +266,6 @@ kernel SUNRPC support is required by using GSS.
 ]) # LC_CONFIG_SUNRPC
 
 #
-# LC_HAVE_CRYPTO_HASH
-#
-# 4.6 kernel commit 896545098777564212b9e91af4c973f094649aa7
-# removed crypto_hash support. Since GSS only works with
-# crypto_hash it has to be disabled for newer distros.
-#
-AC_DEFUN([LC_HAVE_CRYPTO_HASH], [
-LB_CHECK_COMPILE([if crypto_hash API is supported],
-crypto_hash, [
-	#include <linux/crypto.h>
-],[
-	crypto_hash_digestsize(NULL);
-], [], [enable_gss="no"])
-])
-]) # LC_HAVE_CRYPTO_HASH
-
-#
 # LC_CONFIG_GSS (default 'auto' (tests for dependencies, if found, enables))
 #
 # Build gss and related tools of Lustre. Currently both kernel and user space
@@ -297,7 +280,6 @@ AC_MSG_RESULT([$enable_gss])
 
 AS_IF([test "x$enable_gss" != xno], [
 	LC_CONFIG_GSS_KEYRING
-	LC_HAVE_CRYPTO_HASH
 	LC_HAVE_CRED_TGCRED
 	LC_KEY_TYPE_INSTANTIATE_2ARGS
 	sunrpc_required=$enable_gss
@@ -349,9 +331,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 
 	int main(void) {
 		int rc;
-		HMAC_CTX ctx;
-		HMAC_CTX_init(&ctx);
-		rc = HMAC_Init_ex(&ctx, "test", 4, EVP_md_null(), NULL);
+		rc = HMAC_Init_ex(NULL, "test", 4, EVP_md_null(), NULL);
 	}
 ])],[AC_DEFINE(HAVE_OPENSSL_SSK, 1,
 	       [OpenSSL HMAC functions needed for SSK])],
@@ -1696,6 +1676,27 @@ kiocb_ki_left, [
 ]) # LC_KIOCB_KI_LEFT
 
 #
+# LC_INIT_LIST_HEAD_RCU
+#
+# 3.12 added INIT_LIST_HEAD_RCU in commit 2a855b644c310d5db5
+# which is unfortunately an inline function and not a macro
+# that can be tested directly, so it needs a configure check.
+#
+AC_DEFUN([LC_INIT_LIST_HEAD_RCU], [
+LB_CHECK_COMPILE([if 'INIT_LIST_HEAD_RCU' exists],
+init_list_head_rcu, [
+	#include <linux/list.h>
+	#include <linux/rculist.h>
+],[
+	struct list_head list;
+	INIT_LIST_HEAD_RCU(&list);
+],[
+	AC_DEFINE(HAVE_INIT_LIST_HEAD_RCU, 1,
+		  [INIT_LIST_HEAD_RCU exists])
+])
+]) # LC_INIT_LIST_HEAD_RCU
+
+#
 # LC_VFS_RENAME_5ARGS
 #
 # 3.13 has vfs_rename with 5 args
@@ -2850,6 +2851,45 @@ vm_operations_no_vm_area_struct, [
 ]) # LC_VM_OPERATIONS_REMOVE_VMF_ARG
 
 #
+# LC_HAVE_KEY_USAGE_REFCOUNT
+#
+# Kernel version 4.11 commit fff292914d3a2f1efd05ca71c2ba72a3c663201e
+# converted key.usage from atomic_t to refcount_t.
+#
+AC_DEFUN([LC_HAVE_KEY_USAGE_REFCOUNT], [
+LB_CHECK_COMPILE([if 'key.usage' is refcount_t],
+key_usage_refcount, [
+	#include <linux/key.h>
+],[
+	struct key key = { };
+
+	refcount_read(&key.usage);
+],[
+	AC_DEFINE(HAVE_KEY_USAGE_REFCOUNT, 1, [key.usage is of type refcount_t])
+])
+]) #LC_HAVE_KEY_USAGE_REFCOUNT
+
+#
+# LC_HAVE_CRYPTO_MAX_ALG_NAME_128
+#
+# Kernel version 4.11 commit f437a3f477cce402dbec6537b29e9e33962c9f73
+# switched CRYPTO_MAX_ALG_NAME from 64 to 128.
+#
+AC_DEFUN([LC_HAVE_CRYPTO_MAX_ALG_NAME_128], [
+LB_CHECK_COMPILE([if 'CRYPTO_MAX_ALG_NAME' is 128],
+crypto_max_alg_name, [
+	#include <linux/crypto.h>
+],[
+	#if CRYPTO_MAX_ALG_NAME != 128
+	exit(1);
+	#endif
+],[
+	AC_DEFINE(HAVE_CRYPTO_MAX_ALG_NAME_128, 1,
+		['CRYPTO_MAX_ALG_NAME' is 128])
+])
+]) # LC_HAVE_CRYPTO_MAX_ALG_NAME_128
+
+#
 # Kernel version 4.12 commit 47f38c539e9a42344ff5a664942075bd4df93876
 # CURRENT_TIME is not 64 bit time safe so it was replaced with
 # current_time()
@@ -2859,7 +2899,9 @@ LB_CHECK_COMPILE([if CURRENT_TIME has been replaced with current_time],
 current_time, [
 	#include <linux/fs.h>
 ],[
-	struct timespec ts = current_time(NULL);
+	struct iattr attr;
+
+	attr.ia_atime = current_time(NULL);
 ],[
 	AC_DEFINE(HAVE_CURRENT_TIME, 1,
 		[current_time() has replaced CURRENT_TIME])
@@ -2952,7 +2994,6 @@ bi_bdev, [
 ])
 ]) # LC_BI_BDEV
 
-
 #
 # LC_PROG_LINUX
 #
@@ -3081,6 +3122,7 @@ AC_DEFUN([LC_PROG_LINUX], [
 	LC_OLDSIZE_TRUNCATE_PAGECACHE
 	LC_PTR_ERR_OR_ZERO_MISSING
 	LC_KIOCB_KI_LEFT
+	LC_INIT_LIST_HEAD_RCU
 
 	# 3.13
 	LC_VFS_RENAME_5ARGS
@@ -3179,6 +3221,8 @@ AC_DEFUN([LC_PROG_LINUX], [
 	# 4.11
 	LC_INODEOPS_ENHANCED_GETATTR
 	LC_VM_OPERATIONS_REMOVE_VMF_ARG
+	LC_HAVE_KEY_USAGE_REFCOUNT
+	LC_HAVE_CRYPTO_MAX_ALG_NAME_128
 
 	# 4.12
 	LC_CURRENT_TIME
@@ -3513,8 +3557,10 @@ lustre/doc/Makefile
 lustre/include/Makefile
 lustre/include/lustre/Makefile
 lustre/include/uapi/linux/lustre/Makefile
-lustre/kernel_patches/targets/3.10-rhel7.target
-lustre/kernel_patches/targets/4.14-rhel7.target
+lustre/kernel_patches/targets/3.10-rhel7.6.target
+lustre/kernel_patches/targets/3.10-rhel7.5.target
+lustre/kernel_patches/targets/4.14-rhel7.5.target
+lustre/kernel_patches/targets/4.14-rhel7.6.target
 lustre/kernel_patches/targets/2.6-rhel6.9.target
 lustre/kernel_patches/targets/2.6-rhel6.8.target
 lustre/kernel_patches/targets/2.6-rhel6.7.target