Linux 3.7: remove use of param.h and ioctl.h

Header files param.h and ioctl.h have moved as part of the userspace
API restructuring of header files.  Nothing in those files is
currently needed by the source, so just drop the includes.

Change-Id: Icbbf7038ca1bf23edbde42aaf48f5108626d0040
Reviewed-on: http://gerrit.openafs.org/8469
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/src/afs/afs_buffer.c b/src/afs/afs_buffer.c
index 6eb7730..2810d9d 100644 (file)
--- a/src/afs/afs_buffer.c
+++ b/src/afs/afs_buffer.c
@@ -14,7 +14,9 @@
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #if !defined(UKERNEL)
-#include "h/param.h"
+#if !defined(AFS_LINUX26_ENV)
+# include "h/param.h"
+#endif
 #include "h/types.h"
 #include "h/time.h"
 #if    defined(AFS_AIX31_ENV)

diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index 30f497d..ae82dbe 100644 (file)
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -11,7 +11,9 @@
 #define _AFS_OSI_
 
 #include "h/types.h"
+#if !defined(AFS_LINUX26_ENV)
 #include "h/param.h"
+#endif
 
 #ifdef AFS_FBSD_ENV
 #include <sys/condvar.h>

diff --git a/src/dir/dir.c b/src/dir/dir.c
index 4e7a844..08b9db5 100644 (file)
--- a/src/dir/dir.c
+++ b/src/dir/dir.c
@@ -13,7 +13,9 @@
 #ifdef KERNEL
 # if !defined(UKERNEL)
 #  include "h/types.h"
-#  include "h/param.h"
+#  if !defined(AFS_LINUX26_ENV)
+#   include "h/param.h"
+#  endif
 #  ifdef       AFS_AUX_ENV
 #   include "h/mmu.h"
 #   include "h/seg.h"

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 4ec4821..9133045 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -35,7 +35,9 @@ typedef unsigned short etap_event_t;
 
 
 #include "h/types.h"
+#if !defined(AFS_LINUX26_ENV)
 #include "h/param.h"
+#endif
 #ifndef AFS_LINUX22_ENV
 #include "h/systm.h"
 #endif

diff --git a/src/rx/rx_packet.h b/src/rx/rx_packet.h
index 0929de3..b7cc508 100644 (file)
--- a/src/rx/rx_packet.h
+++ b/src/rx/rx_packet.h
@@ -43,7 +43,9 @@
 #if !defined(AFS_DARWIN_ENV) && !defined(AFS_USR_DARWIN_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_USR_FBSD_ENV) && !defined(AFS_USR_DFBSD_ENV) && !defined(AFS_LINUX20_ENV)
 #include <sys/sysmacros.h>     /* MIN, MAX on Solaris */
 #endif
+#if !defined(AFS_LINUX26_ENV)
 #include <sys/param.h>         /* MIN, MAX elsewhere */
+#endif
 #endif /* AFS_NT40_ENV */
 
 #define        IPv6_HDR_SIZE           40      /* IPv6 Header */

diff --git a/src/rx/xdr.c b/src/rx/xdr.c
index 2639de3..df6d179 100644 (file)
--- a/src/rx/xdr.c
+++ b/src/rx/xdr.c
@@ -48,7 +48,9 @@
 #ifndef        NeXT
 
 #if defined(KERNEL) && !defined(UKERNEL)
+#if !defined(AFS_LINUX26_ENV)
 #include <sys/param.h>
+#endif
 #ifndef AFS_LINUX20_ENV
 #include <sys/systm.h>
 #endif

diff --git a/src/rx/xdr_array.c b/src/rx/xdr_array.c
index b1c3866..75bcd7c 100644 (file)
--- a/src/rx/xdr_array.c
+++ b/src/rx/xdr_array.c
@@ -47,8 +47,9 @@
  */
 
 #if defined(KERNEL) && !defined(UKERNEL)
-
+#if !defined(AFS_LINUX26_ENV)
 #include <sys/param.h>
+#endif
 #ifdef AFS_LINUX20_ENV
 #include "h/string.h"
 #else

diff --git a/src/rx/xdr_arrayn.c b/src/rx/xdr_arrayn.c
index a7301d3..2a2e081 100644 (file)
--- a/src/rx/xdr_arrayn.c
+++ b/src/rx/xdr_arrayn.c
@@ -47,8 +47,9 @@
  */
 
 #if defined(KERNEL) && !defined(UKERNEL)
-
+#if !defined(AFS_LINUX26_ENV)
 #include <sys/param.h>
+#endif
 #ifdef AFS_LINUX20_ENV
 #include "h/string.h"
 #else

diff --git a/src/rx/xdr_int32.c b/src/rx/xdr_int32.c
index c30b4e2..63bf09a 100644 (file)
--- a/src/rx/xdr_int32.c
+++ b/src/rx/xdr_int32.c
@@ -34,9 +34,11 @@
 #ifndef        NeXT
 
 #if defined(KERNEL) && !defined(UKERNEL)
-#include <sys/param.h>
+# if !defined(AFS_LINUX26_ENV)
+#  include <sys/param.h>
+# endif
 #else
-#include <roken.h>
+# include <roken.h>
 #endif
 #include "xdr.h"
 

diff --git a/src/util/vice.h b/src/util/vice.h
index 7e3db07..1920a35 100644 (file)
--- a/src/util/vice.h
+++ b/src/util/vice.h
@@ -12,9 +12,9 @@
 
 #include <sys/types.h>
 #if !defined(AFS_NT40_ENV)
-# if !defined(AFS_FBSD80_ENV) || !defined(KERNEL) || defined(UKERNEL)
-#include <sys/ioctl.h>
-#endif /* AFS_FBSD80_ENV */
+# if (!defined(AFS_FBSD80_ENV) && !defined(AFS_LINUX26_ENV)) || !defined(KERNEL) || defined(UKERNEL)
+#  include <sys/ioctl.h>
+# endif
 #endif /* AFS_NT40_ENV */
 #if (defined(__sun) && defined(__SVR4)) || defined(AFS_DFBSD_ENV) || defined(AFS_USR_DFBSD_ENV)
 # include <sys/ioccom.h>