Revert "LINUX: eliminate unused variable warning"
[openafs.git] / acinclude.m4
index 9b4d94e..f8edc67 100644 (file)
@@ -111,6 +111,11 @@ AC_ARG_ENABLE([pthreaded-ubik],
          enabled)])],
     [],
     [enable_pthreaded_ubik="yes"])
+AC_ARG_ENABLE([ubik-read-while-write],
+    [AS_HELP_STRING([--enable-ubik-read-while-write],
+       [enable vlserver read from db cache during write locks (EXPERIMENTAL)])],
+    [],
+    [enable_ubik_read_while_write="no"])
 
 dnl Kernel module build options.
 AC_ARG_WITH([linux-kernel-headers],
@@ -456,11 +461,9 @@ case $system in
         *-solaris*)
                MKAFS_OSTYPE=SOLARIS
                 AC_MSG_RESULT(sun4)
-               AC_PATH_PROG(SOLARISCC, [cc], ,
-                   [/opt/SUNWspro/bin:/opt/SunStudioExpress/bin:/opt/solarisstudio12.3/bin:/opt/solstudio12.2/bin:/opt/sunstudio12.1/bin])
-               if test "x$SOLARISCC" = "x" ; then
-                   AC_MSG_FAILURE(Could not find the solaris cc program.  Please define the environment variable SOLARISCC to specify the path.)
-               fi
+               SOLARIS_PATH_CC
+               SOLARIS_CC_TAKES_XVECTOR_NONE
+               AC_SUBST(SOLARIS_CC_KOPTS)
                SOLARIS_UFSVFS_HAS_DQRWLOCK
                SOLARIS_FS_HAS_FS_ROLLED
                SOLARIS_SOLOOKUP_TAKES_SOCKPARAMS
@@ -693,6 +696,22 @@ else
                        AFS_SYSNAME="x86_darwin_150"
                        OSXSDK="macosx10.11"
                        ;;
+               x86_64-apple-darwin16.*)
+                       AFS_SYSNAME="x86_darwin_160"
+                       OSXSDK="macosx10.12"
+                       ;;
+               i?86-apple-darwin16.*)
+                       AFS_SYSNAME="x86_darwin_160"
+                       OSXSDK="macosx10.12"
+                       ;;
+               x86_64-apple-darwin17.*)
+                       AFS_SYSNAME="x86_darwin_170"
+                       OSXSDK="macosx10.13"
+                       ;;
+               i?86-apple-darwin17.*)
+                       AFS_SYSNAME="x86_darwin_170"
+                       OSXSDK="macosx10.13"
+                       ;;
                sparc-sun-solaris2.8)
                        AFS_SYSNAME="sun4x_58"
                        ;;
@@ -912,15 +931,23 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                                          [#include <linux/fs.h>],
                                          [void],
                                          [struct inode *inode, void *link_data])
+                AC_CHECK_LINUX_OPERATION([inode_operations], [rename], [takes_flags],
+                                         [#include <linux/fs.h>],
+                                         [int],
+                                         [struct inode *oinode, struct dentry *odentry,
+                                               struct inode *ninode, struct dentry *ndentry,
+                                               unsigned int flags])
 
                 dnl Check for header files
+                AC_CHECK_LINUX_HEADER([cred.h])
                 AC_CHECK_LINUX_HEADER([config.h])
-                AC_CHECK_LINUX_HEADER([completion.h])
                 AC_CHECK_LINUX_HEADER([exportfs.h])
                 AC_CHECK_LINUX_HEADER([freezer.h])
                 AC_CHECK_LINUX_HEADER([key-type.h])
                 AC_CHECK_LINUX_HEADER([semaphore.h])
                 AC_CHECK_LINUX_HEADER([seq_file.h])
+                AC_CHECK_LINUX_HEADER([sched/signal.h])
+                AC_CHECK_LINUX_HEADER([uaccess.h])
 
                 dnl Type existence checks
                 AC_CHECK_LINUX_TYPE([struct vfs_path], [dcache.h])
@@ -936,6 +963,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_STRUCT([ctl_table], [ctl_name], [sysctl.h])
                 AC_CHECK_LINUX_STRUCT([dentry], [d_u.d_alias], [dcache.h])
                 AC_CHECK_LINUX_STRUCT([dentry_operations], [d_automount], [dcache.h])
+                AC_CHECK_LINUX_STRUCT([group_info], [gid], [cred.h])
                 AC_CHECK_LINUX_STRUCT([inode], [i_alloc_sem], [fs.h])
                 AC_CHECK_LINUX_STRUCT([inode], [i_blkbits], [fs.h])
                 AC_CHECK_LINUX_STRUCT([inode], [i_blksize], [fs.h])
@@ -948,6 +976,7 @@ 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([inode_operations], [get_link], [fs.h])
                 AC_CHECK_LINUX_STRUCT([key], [payload.value], [key.h])
                 AC_CHECK_LINUX_STRUCT([key_type], [instantiate_prep], [key-type.h])
                 AC_CHECK_LINUX_STRUCT([key_type], [match_preparse], [key-type.h])
@@ -980,12 +1009,19 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
 
                 dnl Function existence checks
 
-                AC_CHECK_LINUX_FUNC([__vfs_read],
+                AC_CHECK_LINUX_FUNC([__vfs_write],
+                                    [#include <linux/fs.h>],
+                                    [__vfs_write(NULL, NULL, 0, NULL);])
+                AC_CHECK_LINUX_FUNC([kernel_write],
                                     [#include <linux/fs.h>],
-                                    [__vfs_read(NULL, NULL, 0, NULL);])
+                                    [kernel_write(NULL, NULL, 0, NULL);])
                  AC_CHECK_LINUX_FUNC([bdi_init],
                                     [#include <linux/backing-dev.h>],
                                     [bdi_init(NULL);])
+                 AC_CHECK_LINUX_FUNC([super_setup_bdi],
+                                     [#include <linux/backing-dev.h>],
+                                     [struct super_block *sb;
+                                     super_setup_bdi(sb);])
                  AC_CHECK_LINUX_FUNC([PageChecked],
                                     [#include <linux/mm.h>
 #include <linux/page-flags.h>],
@@ -1015,6 +1051,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_FUNC([do_sync_read],
                                     [#include <linux/fs.h>],
                                     [do_sync_read(NULL, NULL, 0, NULL);])
+                AC_CHECK_LINUX_FUNC([file_dentry],
+                                    [#include <linux/fs.h>],
+                                    [struct file *f; file_dentry(f);])
                 AC_CHECK_LINUX_FUNC([find_task_by_pid],
                                     [#include <linux/sched.h>],
                                     [pid_t p; find_task_by_pid(p);])
@@ -1042,9 +1081,15 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_FUNC([kernel_setsockopt],
                                     [#include <linux/net.h>],
                                     [kernel_setsockopt(NULL, 0, 0, NULL, 0);])
+                AC_CHECK_LINUX_FUNC([locks_lock_file_wait],
+                                    [#include <linux/fs.h>],
+                                    [locks_lock_file_wait(NULL, NULL);])
                 AC_CHECK_LINUX_FUNC([page_follow_link],
                                     [#include <linux/fs.h>],
                                     [page_follow_link(0,0);])
+                AC_CHECK_LINUX_FUNC([page_get_link],
+                                    [#include <linux/fs.h>],
+                                    [page_get_link(0,0,0);])
                 AC_CHECK_LINUX_FUNC([page_offset],
                                     [#include <linux/pagemap.h>],
                                     [page_offset(NULL);])
@@ -1064,6 +1109,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_FUNC([set_nlink],
                                     [#include <linux/fs.h>],
                                     [set_nlink(NULL, 1);])
+                AC_CHECK_LINUX_FUNC([setattr_prepare],
+                                    [#include <linux/fs.h>],
+                                    [setattr_prepare(NULL, NULL);])
                 AC_CHECK_LINUX_FUNC([sock_create_kern],
                                     [#include <linux/net.h>],
                                     [sock_create_kern(0, 0, 0, NULL);])
@@ -1073,6 +1121,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 AC_CHECK_LINUX_FUNC([splice_direct_to_actor],
                                     [#include <linux/splice.h>],
                                     [splice_direct_to_actor(NULL,NULL,NULL);])
+                AC_CHECK_LINUX_FUNC([default_file_splice_read],
+                                    [#include <linux/fs.h>],
+                                    [default_file_splice_read(NULL,NULL,NULL, 0, 0);])
                 AC_CHECK_LINUX_FUNC([svc_addr_in],
                                     [#include <linux/sunrpc/svc.h>],
                                     [svc_addr_in(NULL);])
@@ -1086,6 +1137,12 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                                     [#include <linux/kernel.h>
                                      #include <linux/kthread.h>],
                                     [kthread_run(NULL, NULL, "test");])
+                AC_CHECK_LINUX_FUNC([inode_nohighmem],
+                                    [#include <linux/fs.h>],
+                                    [inode_nohighmem(NULL);])
+                AC_CHECK_LINUX_FUNC([inode_lock],
+                                    [#include <linux/fs.h>],
+                                    [inode_lock(NULL);])
 
                 dnl Consequences - things which get set as a result of the
                 dnl                above tests
@@ -1116,6 +1173,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_AOP_WRITEBACK_CONTROL
                 LINUX_FS_STRUCT_FOP_HAS_SPLICE
                 LINUX_KERNEL_POSIX_LOCK_FILE_WAIT_ARG
+                LINUX_KERNEL_PAGEVEC_INIT_COLD_ARG
                 LINUX_POSIX_TEST_LOCK_RETURNS_CONFLICT
                 LINUX_POSIX_TEST_LOCK_CONFLICT_ARG
                 LINUX_KERNEL_SOCK_CREATE
@@ -1134,6 +1192,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_REGISTER_SYSCTL_TABLE_NOFLAG
                 LINUX_HAVE_DCACHE_LOCK
                 LINUX_D_COUNT_IS_INT
+                LINUX_IOP_GETATTR_TAKES_PATH_STRUCT
                 LINUX_IOP_MKDIR_TAKES_UMODE_T
                 LINUX_IOP_CREATE_TAKES_UMODE_T
                 LINUX_EXPORT_OP_ENCODE_FH_TAKES_INODES
@@ -1145,6 +1204,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED
                 LINUX_IOP_LOOKUP_TAKES_UNSIGNED
                 LINUX_D_INVALIDATE_IS_VOID
+                LINUX_KERNEL_READ_OFFSET_IS_LAST
 
                 dnl If we are guaranteed that keyrings will work - that is
                 dnl  a) The kernel has keyrings enabled
@@ -1216,11 +1276,15 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
                 if test -f "$LINUX_KERNEL_PATH/include/linux/mm_inline.h"; then
                  AC_DEFINE(HAVE_MM_INLINE_H, 1, [define if you have mm_inline.h header file])
                 fi
-                if test "x$ac_cv_linux_kernel_page_follow_link" = "xyes" -o "x$ac_cv_linux_func_i_put_link_takes_cookie" = "xyes"; then
+                if test "x$ac_cv_linux_func_page_get_link" = "xyes" -o "x$ac_cv_linux_func_i_put_link_takes_cookie" = "xyes"; then
                  AC_DEFINE(USABLE_KERNEL_PAGE_SYMLINK_CACHE, 1, [define if your kernel has a usable symlink cache API])
                 else
                  AC_MSG_WARN([your kernel does not have a usable symlink cache API])
                 fi
+                if test "x$ac_cv_linux_func_page_get_link" != "xyes" -a "x$ac_cv_linux_struct_inode_operations_has_get_link" = "xyes"; then
+                       AC_MSG_ERROR([Your kernel does not use follow_link - not supported without symlink cache API])
+                       exit 1
+                fi
                 :
                fi
                if test "x$enable_linux_d_splice_alias_extra_iput" = xyes; then
@@ -1390,6 +1454,10 @@ else
 fi
 AC_SUBST(USE_UNIX_SOCKETS)
 
+if test "$enable_ubik_read_while_write" = "yes"; then
+       AC_DEFINE(UBIK_READ_WHILE_WRITE, 1, [define if you want to enable ubik read while write])
+fi
+
 if test "$enable_namei_fileserver" = "yes"; then
        AC_DEFINE(AFS_NAMEI_ENV, 1, [define if you want to want namei fileserver])
        VFSCK=""
@@ -1423,6 +1491,8 @@ if test "$enable_tivoli_tsm" = "yes"; then
        XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen
        XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample
        XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample
+       XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample
+       XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample
 
        if test -r "$XBSADIR3/dsmapifp.h"; then
                XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3"
@@ -1432,6 +1502,14 @@ if test "$enable_tivoli_tsm" = "yes"; then
                XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4"
                XBSA_XLIBS="-ldl"
                AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+       elif test -r "$XBSADIR5/dsmapifp.h"; then
+               XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5"
+               XBSA_XLIBS="-ldl"
+               AC_MSG_RESULT([yes, $XBSA_CFLAGS])
+       elif test -r "$XBSADIR6/dsmapifp.h"; then
+               XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6"
+               XBSA_XLIBS="-ldl"
+               AC_MSG_RESULT([yes, $XBSA_CFLAGS])
        elif test -r "$XBSADIR1/xbsa.h"; then
                XBSA_CFLAGS="-Dxbsa -I$XBSADIR1"
                XBSA_XLIBS=""
@@ -1564,7 +1642,7 @@ if test "$enable_debug_locks" = yes; then
 fi
 
 if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_pam" = yes; then
-       HAVE_PAM="YES"
+       HAVE_PAM="yes"
 else
        HAVE_PAM="no"
 fi
@@ -1586,6 +1664,7 @@ AC_SUBST(INSTALL_KAUTH)
 
 AC_CHECK_FUNCS([ \
        arc4random \
+       closelog \
        fcntl \
        fseeko64 \
        ftello64 \
@@ -1597,6 +1676,7 @@ AC_CHECK_FUNCS([ \
        getrlimit \
        issetugid \
        mkstemp \
+       openlog \
        poll \
        pread \
        preadv \
@@ -1614,6 +1694,7 @@ AC_CHECK_FUNCS([ \
        strerror \
        sysconf \
        sysctl \
+       syslog \
        tdestroy \
        timegm \
 ])