STABLE14-linux-2624-rc5-updates-20080110

LICENSE IPL10
FIXES 80463

Include linux/key-type.h in osi_groups.c, if it exists. Fix
do_sync_read test for recent kbuild (maybe break it for [some older 2.6]).

(cherry picked from commit 8569f67aee8ee0de26259397818ab3af69f18007)

diff --git a/acinclude.m4 b/acinclude.m4
index 28fdb69c903f2757692fcc8f1f853b10e7ef6616..2f58150747f475d861f3ebf2f0fd2612e7d0a126 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -657,6 +657,10 @@ 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 c0d82702792ceb47da3d2aa87de3a6138dffb5d1..01ddb0765a905575e5ab04bce6f8ba99375ae403 100644 (file)
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -17,6 +17,9 @@
 #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 cbc127d2167d219d058523abf9160facc5e00def..20f50cba5f559d99d89986ca62e0e8ccec93d114 100644 (file)
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -719,11 +719,28 @@ extern int vfs_statfs(struct dentry *, struct kstatfs *);
       ac_cv_linux_statfs_takes_dentry=no)])
   AC_MSG_RESULT($ac_cv_linux_statfs_takes_dentry)])
 
+
+AC_DEFUN([LINUX_KEY_TYPE_H_EXISTS], [
+  AC_MSG_CHECKING([for linux/key-type.h existance])
+  AC_CACHE_VAL([ac_cv_linux_key_type_h_exists], [
+    AC_TRY_KBUILD(
+[#include <linux/key-type.h>],
+[return;],
+      ac_cv_linux_key_type_h_exists=yes,
+      ac_cv_linux_key_type_h_exists=no)])
+  AC_MSG_RESULT($ac_cv_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 linux/key-type.h exists])
+  fi])
+
 AC_DEFUN([LINUX_LINUX_KEYRING_SUPPORT], [
   AC_MSG_CHECKING([for linux kernel keyring support])
   AC_CACHE_VAL([ac_cv_linux_keyring_support], [
     AC_TRY_KBUILD(
 [#include <linux/rwsem.h>
+#ifdef KEY_TYPE_H_EXISTS
+#include <linux/key-type.h>
+#endif
 #include <linux/key.h>
 #include <linux/keyctl.h>],
 [#ifdef CONFIG_KEYS
@@ -760,7 +777,7 @@ AC_DEFUN([LINUX_DO_SYNC_READ], [
   AC_MSG_CHECKING([for linux do_sync_read()])
   AC_CACHE_VAL([ac_cv_linux_do_sync_read], [
     save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
+    EXTRA_FLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
     AC_TRY_KBUILD(
 [#include <linux/fs.h>],
 [do_sync_read(NULL, NULL, 0, NULL);],