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

afs: retire HAVE_LINUX_COMPLETION_H conditionals

Browse Source 
Now that support for linux 2.4 has been sunset, as of commit
ccf353ede6, it is no longer necessary to
put conditional compilation checks around the linux wait-for-completion
functions, which were introduced sometime during the linux 2.4 series
and have been available since.

Also, remove the remnant LINUX_COMPLETION_H_EXISTS autoconf macro, which
was removed from use in commit ef8bd5a29b.

Change-Id: Iea974236f73eef8c567a897d6a473254edf95379
Reviewed-on: https://gerrit.openafs.org/12278
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
This commit is contained in:
Michael Meffie 2016-05-03 20:31:41 -04:00 committed by Benjamin Kaduk
parent 591da537e2
commit b0e6dd60b7
4 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acinclude.m4
View File

@ -915,7 +915,6 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
dnl Check for header files
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])

6
src/afs/afs_call.c
View File

@ -41,7 +41,7 @@
#define AFS_MINBUFFERS 50
#endif
#if (defined(AFS_SUN5_ENV) || (defined(AFS_LINUX24_ENV) && defined(HAVE_LINUX_COMPLETION_H)) || defined(AFS_DARWIN80_ENV)) && !defined(UKERNEL)
#if (defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV) || defined(AFS_DARWIN80_ENV)) && !defined(UKERNEL)
/* If AFS_DAEMONOP_ENV is defined, it indicates we run "daemon" AFS syscalls by
* spawning a kernel thread to do the work, instead of running them in the
* calling process. */
@ -276,9 +276,9 @@ afs_DaemonOp(long parm, long parm2, long parm3, long parm4, long parm5,
#endif
#if defined(AFS_LINUX24_ENV) && defined(HAVE_LINUX_COMPLETION_H)
#if defined(AFS_LINUX26_ENV)
struct afsd_thread_info {
# if defined(AFS_LINUX26_ENV) && !defined(INIT_WORK_HAS_DATA)
# if !defined(INIT_WORK_HAS_DATA)
struct work_struct tq;
# endif
unsigned long parm;

4
src/afs/sysincludes.h
View File

@ -165,9 +165,7 @@ struct xfs_inode_info {
# include <linux/mutex.h>
# endif
# include <linux/errno.h>
# ifdef HAVE_LINUX_COMPLETION_H
# include <linux/completion.h>
# endif
# include <linux/completion.h>
# if defined(HAVE_LINUX_EXPORTFS_H)
# include <linux/exportfs.h>
# endif

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

@ -25,20 +25,6 @@ read_lock(&tasklist_lock);
[])
])
AC_DEFUN([LINUX_COMPLETION_H_EXISTS], [
AC_CHECK_LINUX_BUILD([for linux/completion.h],
[ac_cv_linux_completion_h_exists],
[#include <linux/version.h>
#include <linux/completion.h>],
[struct completion _c;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,8)
lose
#endif],
[HAVE_LINUX_COMPLETION_H]
[Define if your kernel has a usable linux/completion.h],
[])
])
AC_DEFUN([LINUX_EXPORTS_INIT_MM], [
AC_CHECK_LINUX_BUILD([for exported init_mm],