From: James Simmons <uja.ornl@gmail.com>
Date: Mon, 28 Oct 2013 12:35:55 +0000 (-0400)
Subject: LU-2800 auotconf: remove linux key-type.h test
X-Git-Tag: 2.5.52~78
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=2420f7ef2b7efbc715735019fa632146b23f2546

LU-2800 auotconf: remove linux key-type.h test

Since linux kernel version 2.6.24 key-type.h has
been available so we no longer need to test this.

Signed-off-by: James Simmons <uja.ornl@gmail.com>
Change-Id: I6ed82effb62a0dadabb8477e419c42e8540c91d9
Reviewed-on: http://review.whamcloud.com/5546
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Thomas Stibor <thomas@stibor.net>
Reviewed-by: Andrew Korty <ajk@iu.edu>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index abc00db..09a9bdd 100644
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -119,15 +119,6 @@ LB_LINUX_TRY_COMPILE([
 ])
 ])
 
-AC_DEFUN([LIBCFS_HAVE_KEYTYPE_H],
-[LB_CHECK_FILE([$LINUX/include/linux/key-type.h], [
-        AC_DEFINE(HAVE_LINUX_KEYTYPE_H, 1,
-                [kernel has include/key-type.h])
-],[
-        AC_MSG_RESULT([no])
-])
-])
-
 #
 # RHEL6/2.6.32 want to have pointer to shrinker self pointer in handler function
 #
@@ -329,7 +320,6 @@ LIBCFS_CONFIG_PANIC_DUMPLOG
 LIBCFS_U64_LONG_LONG_LINUX
 # 2.6.24
 LIBCFS_SYSCTL_UNNUMBERED
-LIBCFS_HAVE_KEYTYPE_H
 # 2.6.32
 LIBCFS_STACKTRACE_OPS_HAVE_WALK_STACK
 LC_SHRINKER_WANT_SHRINK_PTR
diff --git a/lustre/ptlrpc/gss/gss_keyring.c b/lustre/ptlrpc/gss/gss_keyring.c
index 14e7983..05a1b0f 100644
--- a/lustre/ptlrpc/gss/gss_keyring.c
+++ b/lustre/ptlrpc/gss/gss_keyring.c
@@ -48,9 +48,7 @@
 #include <linux/crypto.h>
 #include <linux/key.h>
 #include <linux/keyctl.h>
-#ifdef HAVE_LINUX_KEYTYPE_H
 #include <linux/key-type.h>
-#endif
 #include <linux/mutex.h>
 #include <asm/atomic.h>
 #else