LINUX: Avoid check for key_type.match existence

[openafs.git] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 7040e19..97c2d79 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -890,8 +890,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_STRUCT([file_operations], [sendfile], [fs.h])
                 AC_CHECK_LINUX_STRUCT([file_system_type], [mount], [fs.h])
                 AC_CHECK_LINUX_STRUCT([inode_operations], [truncate], [fs.h])
-                AC_CHECK_LINUX_STRUCT([key_type], [preparse], [key-type.h])
                 AC_CHECK_LINUX_STRUCT([key_type], [instantiate_prep], [key-type.h])
+                AC_CHECK_LINUX_STRUCT([key_type], [match_preparse], [key-type.h])
+                AC_CHECK_LINUX_STRUCT([key_type], [preparse], [key-type.h])
                 AC_CHECK_LINUX_STRUCT([nameidata], [path], [namei.h])
                 AC_CHECK_LINUX_STRUCT([proc_dir_entry], [owner], [proc_fs.h])
                 AC_CHECK_LINUX_STRUCT([super_block], [s_bdi], [fs.h])
@@ -1073,6 +1074,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_IOP_I_CREATE_TAKES_BOOL
                 LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED
                 LINUX_IOP_LOOKUP_TAKES_UNSIGNED
+                LINUX_D_INVALIDATE_IS_VOID
 
                 dnl If we are guaranteed that keyrings will work - that is
                 dnl  a) The kernel has keyrings enabled
@@ -1572,8 +1574,6 @@ AC_CHECK_FUNCS([ \
        gethostname \
        lstat \
        inet_aton \
-       inet_ntop \
-       inet_pton \
        putenv \
        readv \
        setenv \
@@ -1611,6 +1611,8 @@ AC_REPLACE_FUNCS([ \
        getopt \
        getprogname \
        gettimeofday \
+       inet_ntop \
+       inet_pton \
        localtime_r \
        mkstemp \
        setenv \