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 6eb7730a2bf63fd9adb55e43ff339fc0b02f13da..2810d9d3e53bd01036b11aa70699fc1d35335890 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 30f497d6e6080357e26caa005dc6fb5a13eaba3a..ae82dbe435226e6183d36eda2d562b245ea1ddf8 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 4e7a84401c3288aa5e284fa68b1ade9ecc4a19f1..08b9db51e24118fe32f25e715c1dca254eed0ecb 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 4ec48213027199417be9a9bf947b741756d55d6f..9133045a5b8ef2e00fc441d89a4d0e8ee8c6b30e 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 0929de3f5da2a31ef48a6128d1fc75c662a8c158..b7cc5084a6fc8e0007860bb9cbd802b5ef678dd6 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 2639de3d09d9eef39ed19b26c3cdc3680dc4bbc9..df6d179c5f45e1733a2fe3ccc2e788ff3305a05b 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 b1c38661f80c5da2b571eed8fefb484a71fca0af..75bcd7c15bc255d128323920152c13c01e1cb4ea 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 a7301d36467cb380836a0e3778eac400de0a0acc..2a2e0811d407dccdd718b201fcbd119506a7477b 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 c30b4e2d95b2af5cc012513a9bb4a910814878bd..63bf09acaf7f7e9518772347c35101f5ec83b843 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 7e3db079d487762b44c99ac6578b38a649c6283b..1920a352c2c3d55db4612d23f79c5432caa916e8 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>