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.

Reviewed-on: http://gerrit.openafs.org/8469
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit 007ec3e25e6920d7036f70550bc44adefab0c170)

Change-Id: I7caa7ee8e5bfc918d7121a2f1d826102ee03976c
Reviewed-on: http://gerrit.openafs.org/8556
Reviewed-by: Ken Dreyer <ktdreyer@ktdreyer.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Paul Smeddle <paul.smeddle@gmail.com>

diff --git a/src/afs/afs_buffer.c b/src/afs/afs_buffer.c
index bf04c421ff400aa0a5aaef817ab19d9f55e8e93e..7d856c2d2b481f093a349bb04f9ebda9addb238c 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 17966eeaa7ccf04f57079608381d3ccfcc03afba..dfb6b184fffe2d826ad08646e0febbcfc1d1a438 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 b39483157a473a426a63d41b2e5a6084c9277af8..51a78eb42b71a22d16d07562847935d1ef10e96f 100644 (file)
--- a/src/dir/dir.c
+++ b/src/dir/dir.c
@@ -14,7 +14,9 @@
 #ifdef KERNEL
 #if !defined(UKERNEL)
 #include "h/types.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 904735f3fabe7d4dcecc1eab77a3802e578b7ec1..64d03cbb444b5a6b9f14bf76183ab302d8ee5454 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 2b6d183dc5b00b89552fbddd7e932b90f2e63019..df9d9f4168a1cfc8224c68b6b328d2f29a37d473 100644 (file)
--- a/src/rx/rx_packet.h
+++ b/src/rx/rx_packet.h
@@ -42,7 +42,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 057f7c28144060490f581029257d709e76a02619..bd224a163139e7c925f6d5b171870ba40e81acf9 100644 (file)
--- a/src/rx/xdr.c
+++ b/src/rx/xdr.c
@@ -49,7 +49,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 ecdf4cce38fa084124bf35cb685653a52229b5c7..886d2c6e4feacfea132b9c7727a5d262a4481360 100644 (file)
--- a/src/rx/xdr_array.c
+++ b/src/rx/xdr_array.c
@@ -43,8 +43,9 @@
  */
 
 #if defined(KERNEL) && !defined(UKERNEL)
-
+#if !defined(AFS_LINUX26_ENV)
 #include <sys/param.h>
+#endif
 #ifdef AFS_LINUX20_ENV
 #include "h/string.h"
 #if 0

diff --git a/src/rx/xdr_arrayn.c b/src/rx/xdr_arrayn.c
index 28db315084f4292fb4a15a5c73815b16aee972eb..5b66598874af10c2e1393275cb72e7b232a67eae 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"
 #if 0

diff --git a/src/rx/xdr_int32.c b/src/rx/xdr_int32.c
index 82c5648c85840887243f7248a88b0d1feebd0510..cf5bf173d6ce7359e1d9bc37b732565ded728175 100644 (file)
--- a/src/rx/xdr_int32.c
+++ b/src/rx/xdr_int32.c
@@ -38,9 +38,11 @@
 #ifndef        NeXT
 
 #if defined(KERNEL) && !defined(UKERNEL)
-#include <sys/param.h>
+# if !defined(AFS_LINUX26_ENV)
+#  include <sys/param.h>
+# endif
 #else
-#include <stdio.h>
+# include <stdio.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>