jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux-2624-rc5-updates-20080110

Browse Source 
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]).
This commit is contained in:
Matt Benjamin 2008-01-10 16:58:30 +00:00 committed by Derrick Brashear
parent 5011ea88ba
commit 8569f67aee
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acinclude.m4
View File

@ -659,6 +659,10 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
AC_DEFINE(FREEZER_H_EXISTS, 1, [define if you have linux/freezer.h]) AC_DEFINE(FREEZER_H_EXISTS, 1, [define if you have linux/freezer.h])
fi fi
LINUX_REFRIGERATOR 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_LINUX_KEYRING_SUPPORT
LINUX_KEY_ALLOC_NEEDS_STRUCT_TASK LINUX_KEY_ALLOC_NEEDS_STRUCT_TASK
LINUX_DO_SYNC_READ LINUX_DO_SYNC_READ

3
src/afs/LINUX/osi_groups.c
View File

@ -17,6 +17,9 @@
#include "afs/param.h" #include "afs/param.h"
#ifdef LINUX_KEYRING_SUPPORT #ifdef LINUX_KEYRING_SUPPORT
#include <linux/seq_file.h> #include <linux/seq_file.h>
#if KEY_TYPE_H_EXISTS
#include <linux/key-type.h>
#endif
#endif #endif
RCSID RCSID

19
src/cf/linux-test4.m4
View File

@ -728,11 +728,28 @@ extern int vfs_statfs(struct dentry *, struct kstatfs *);
ac_cv_linux_statfs_takes_dentry=no)]) ac_cv_linux_statfs_takes_dentry=no)])
AC_MSG_RESULT($ac_cv_linux_statfs_takes_dentry)]) 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_DEFUN([LINUX_LINUX_KEYRING_SUPPORT], [
AC_MSG_CHECKING([for linux kernel keyring support]) AC_MSG_CHECKING([for linux kernel keyring support])
AC_CACHE_VAL([ac_cv_linux_keyring_support], [ AC_CACHE_VAL([ac_cv_linux_keyring_support], [
AC_TRY_KBUILD( AC_TRY_KBUILD(
[#include <linux/rwsem.h> [#include <linux/rwsem.h>
#ifdef KEY_TYPE_H_EXISTS
#include <linux/key-type.h>
#endif
#include <linux/key.h> #include <linux/key.h>
#include <linux/keyctl.h>], #include <linux/keyctl.h>],
[#ifdef CONFIG_KEYS [#ifdef CONFIG_KEYS
@ -769,7 +786,7 @@ AC_DEFUN([LINUX_DO_SYNC_READ], [
AC_MSG_CHECKING([for linux do_sync_read()]) AC_MSG_CHECKING([for linux do_sync_read()])
AC_CACHE_VAL([ac_cv_linux_do_sync_read], [ AC_CACHE_VAL([ac_cv_linux_do_sync_read], [
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -Werror-implicit-function-declaration" EXTRA_FLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
AC_TRY_KBUILD( AC_TRY_KBUILD(
[#include <linux/fs.h>], [#include <linux/fs.h>],
[do_sync_read(NULL, NULL, 0, NULL);], [do_sync_read(NULL, NULL, 0, NULL);],