From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 28 Jan 2008 19:30:06 +0000 (+0000)
Subject: DEVEL15-revert-linux-2624-rc5-updates-20080127
X-Git-Tag: openafs-devel-1_5_31~61
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c2243623e4bffdef8367fbc072e0e8869edec5f4;p=packages%2Fo%2Fopenafs.git

DEVEL15-revert-linux-2624-rc5-updates-20080127

LICENSE IPL10
FIXES 83716

the generic 2.6.24 patch should address all this.


(cherry picked from commit a0fd168db5e24fca5f08ccf67d53f58c6f05fa35)
---

diff --git a/acinclude.m4 b/acinclude.m4
index 728d433f7..744db2ca5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -674,10 +674,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 		  AC_DEFINE(FREEZER_H_EXISTS, 1, [define if you have linux/freezer.h])
 		 fi
 		 LINUX_REFRIGERATOR
-		 LINUX_KEY_TYPE_H_EXISTS
-		 if test "x$ac_cv_linux_key_type_h_exists" = "xyes" ; then
-		  AC_DEFINE(KEY_TYPE_H_EXISTS, 1, [define if you have linux/key-type.h])
-		 fi
 		 LINUX_LINUX_KEYRING_SUPPORT
 		 LINUX_KEY_ALLOC_NEEDS_STRUCT_TASK
 		 LINUX_DO_SYNC_READ
diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index 184a3e35c..ed7516c67 100644
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -17,9 +17,6 @@
 #include "afs/param.h"
 #ifdef LINUX_KEYRING_SUPPORT
 #include <linux/seq_file.h>
-#if KEY_TYPE_H_EXISTS
-#include <linux/key-type.h>
-#endif
 #endif
 
 RCSID
diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index 48bbe3095..126f75fbe 100644
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -754,8 +754,8 @@ AC_DEFUN([LINUX_LINUX_KEYRING_SUPPORT], [
 #include <linux/keyctl.h>],
 [#ifdef CONFIG_KEYS
 request_key(NULL, NULL, NULL);
-#if !defined(KEY_POS_VIEW) || !defined(KEY_POS_SEARCH)
-#error "Your linux/key.h does not contain KEY_POS_VIEW or KEY_POS_SEARCH"
+#if !defined(KEY_POS_VIEW) || !defined(KEY_POS_SEARCH) || !defined(KEY_POS_SETATTR) 
+#error "Your linux/key.h does not contain KEY_POS_VIEW or KEY_POS_SEARCH or KEY_POS_SETATTR"
 #endif
 #else
 #error rebuild your kernel with CONFIG_KEYS
@@ -785,18 +785,14 @@ AC_DEFUN([LINUX_KEY_ALLOC_NEEDS_STRUCT_TASK], [
 AC_DEFUN([LINUX_DO_SYNC_READ], [
   AC_MSG_CHECKING([for linux do_sync_read()])
   AC_CACHE_VAL([ac_cv_linux_do_sync_read], [
-    AC_TRY_KBUILD(
-[#include <linux/fs.h>],
-[do_sync_read(NULL, NULL, 0, NULL, 0);],
-      ac_cv_linux_do_sync_read=no,
-      ac_cv_linux_do_sync_read=maybe)
-    if test "x$ac_cv_linux_do_sync_read" = "xmaybe"; then
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
     AC_TRY_KBUILD(
 [#include <linux/fs.h>],
 [do_sync_read(NULL, NULL, 0, NULL);],
       ac_cv_linux_do_sync_read=yes,
-      ac_cv_linux_do_sync_read=no)])
-    fi
+      ac_cv_linux_do_sync_read=no)
+    CPPFLAGS="$save_CPPFLAGS"])
   AC_MSG_RESULT($ac_cv_linux_do_sync_read)
   if test "x$ac_cv_linux_do_sync_read" = "xyes"; then
     AC_DEFINE([DO_SYNC_READ], 1, [define if your kernel has do_sync_read()])
@@ -805,18 +801,14 @@ AC_DEFUN([LINUX_DO_SYNC_READ], [
 AC_DEFUN([LINUX_GENERIC_FILE_AIO_READ], [
   AC_MSG_CHECKING([for linux generic_file_aio_read()])
   AC_CACHE_VAL([ac_cv_linux_generic_file_aio_read], [
-    AC_TRY_KBUILD(
-[#include <linux/fs.h>],
-[generic_file_aio_read(NULL, NULL, 0, 0, 0);],
-      ac_cv_linux_generic_file_aio_read=no,
-      ac_cv_linux_generic_file_aio_read=maybe)
-    if test "x$ac_cv_linux_generic_file_aio_read" = "xmaybe"; then
+    save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
     AC_TRY_KBUILD(
 [#include <linux/fs.h>],
 [generic_file_aio_read(NULL, NULL, 0, 0);],
       ac_cv_linux_generic_file_aio_read=yes,
-      ac_cv_linux_generic_file_aio_read=no)])
-    fi
+      ac_cv_linux_generic_file_aio_read=no)
+    CPPFLAGS="$save_CPPFLAGS"])
   AC_MSG_RESULT($ac_cv_linux_generic_file_aio_read)
   if test "x$ac_cv_linux_generic_file_aio_read" = "xyes"; then
     AC_DEFINE([GENERIC_FILE_AIO_READ], 1, [define if your kernel has generic_file_aio_read()])