Use standard Linux paths for all headers

As we're being built by the standard Linux module build system, we
can use the normal #include <linux/blah.h> convention from including
kernel headers.

Reviewed-on: http://gerrit.openafs.org/582
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/LINUX/osi_alloc.c b/src/afs/LINUX/osi_alloc.c
index 62eb698d9c4f1d5209a2e7f9e49947cce24362ce..3de0767b6d310026996e811582ae3d5c12d11b5d 100644 (file)
--- a/src/afs/LINUX/osi_alloc.c
+++ b/src/afs/LINUX/osi_alloc.c
@@ -17,8 +17,8 @@
 
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
-#include "h/mm.h"
-#include "h/slab.h"
+#include <linux/mm.h>
+#include <linux/slab.h>
 
 #include "afs_atomlist.h"
 #include "afs_lhash.h"
@@ -49,7 +49,7 @@ unsigned int afs_linux_hash_verify_count = 0; /* used by hash_verify */
 struct afs_lhash_stat afs_linux_lsb;   /* hash table statistics */
 unsigned int afs_linux_hash_bucket_dist[MAX_BUCKET_LEN];       /* bucket population distribution in our hash table */
 
-#include "h/vmalloc.h"
+#include <linux/vmalloc.h>
 
 /* Allocator support functions (static) */
 

diff --git a/src/afs/LINUX/osi_export.c b/src/afs/LINUX/osi_export.c
index 0fb7dae4826fd4b41baaa22efe68db2943f34485..992cc94390efe92b7f2564cbd61c5d94d8528ec6 100644 (file)
--- a/src/afs/LINUX/osi_export.c
+++ b/src/afs/LINUX/osi_export.c
@@ -23,7 +23,7 @@
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #include "afs/afs_dynroot.h"
-#include "h/smp_lock.h"
+#include <linux/smp_lock.h>
 
 #if !defined(AFS_NONFSTRANS)
 

diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c
index 4a9187c42d4b338c3c9694b9ed21a7c9ee8b893a..2b93b6cf3c646aeea3a868a47fa6a1ea7a52cded 100644 (file)
--- a/src/afs/LINUX/osi_file.c
+++ b/src/afs/LINUX/osi_file.c
@@ -11,14 +11,14 @@
 #include "afs/param.h"
 
 
-#include "h/module.h" /* early to avoid printf->printk mapping */
+#include <linux/module.h> /* early to avoid printf->printk mapping */
 #include "afs/sysincludes.h"   /* Standard vendor system headers */
 #include "afsincludes.h"       /* Afs-based standard headers */
 #include "afs/afs_stats.h"     /* afs statistics */
-#include "h/smp_lock.h"
-#include "h/namei.h"
+#include <linux/smp_lock.h>
+#include <linux/namei.h>
 #if defined(LINUX_USE_FH)
-#include "h/exportfs.h"
+#include <linux/exportfs.h>
 int cache_fh_type = -1;
 int cache_fh_len = -1;
 #endif

diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
index f78562a7264a72d25b5ca7dc72e42b27266fb204..4d2dbd95c515a57a90f3ffa9f40ab836cac03127 100644 (file)
--- a/src/afs/LINUX/osi_groups.c
+++ b/src/afs/LINUX/osi_groups.c
@@ -24,7 +24,7 @@
 #include "afsincludes.h"
 #include "afs/afs_stats.h"     /* statistics */
 #include "afs/nfsclient.h"
-#include "h/smp_lock.h"
+#include <linux/smp_lock.h>
 
 #ifdef AFS_LINUX26_ONEGROUP_ENV
 #define NUMPAGGROUPS 1

diff --git a/src/afs/LINUX/osi_ioctl.c b/src/afs/LINUX/osi_ioctl.c
index 4100982acf47b1c70739a816993f955af7a06d84..cb93b96d0790fa160897835fb8f4b260e627884b 100644 (file)
--- a/src/afs/LINUX/osi_ioctl.c
+++ b/src/afs/LINUX/osi_ioctl.c
@@ -18,8 +18,8 @@
 #include <linux/module.h> /* early to avoid printf->printk mapping */
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
-#include "h/unistd.h"          /* For syscall numbers. */
-#include "h/mm.h"
+#include <linux/unistd.h>              /* For syscall numbers. */
+#include <linux/mm.h>
 
 #ifdef AFS_AMD64_LINUX20_ENV
 #include <asm/ia32_unistd.h>

diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c
index 4848d94ba8fd19b6823c967a2f4f6fe58dc68b39..18ed7eb2f7a86508243d1433a3b16cd51c2f18a4 100644 (file)
--- a/src/afs/LINUX/osi_misc.c
+++ b/src/afs/LINUX/osi_misc.c
@@ -16,13 +16,13 @@
 
 
 #include <linux/module.h> /* early to avoid printf->printk mapping */
-#include "h/dcache.h"
-#include "h/namei.h"
-#include "h/kthread.h"
+#include <linux/dcache.h>
+#include <linux/namei.h>
+#include <linux/kthread.h>
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #include "afs/afs_stats.h"
-#include "h/smp_lock.h"
+#include <linux/smp_lock.h>
 
 int afs_osicred_initialized = 0;
 AFS_UCRED afs_osi_cred;

diff --git a/src/afs/LINUX/osi_module.c b/src/afs/LINUX/osi_module.c
index 8cf1e5033d889f65ae559658795802654690e69e..e5a25d9e9607632d52240ebd93eb3db4dd5e988f 100644 (file)
--- a/src/afs/LINUX/osi_module.c
+++ b/src/afs/LINUX/osi_module.c
@@ -18,8 +18,8 @@
 #include <linux/module.h> /* early to avoid printf->printk mapping */
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
-#include "h/unistd.h"          /* For syscall numbers. */
-#include "h/mm.h"
+#include <linux/unistd.h>              /* For syscall numbers. */
+#include <linux/mm.h>
 
 #ifdef AFS_AMD64_LINUX20_ENV
 #include <asm/ia32_unistd.h>

diff --git a/src/afs/LINUX/osi_nfssrv.c b/src/afs/LINUX/osi_nfssrv.c
index a3df7b283b3f3e1afffbcd7090f64c80ea5398be..24a4b3670c81e8b7d39ffbf163c9f8275e562c4c 100644 (file)
--- a/src/afs/LINUX/osi_nfssrv.c
+++ b/src/afs/LINUX/osi_nfssrv.c
@@ -21,7 +21,7 @@
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #include "nfsclient.h"
-#include "h/smp_lock.h"
+#include <linux/smp_lock.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcauth.h>
 

diff --git a/src/afs/LINUX/osi_pag_module.c b/src/afs/LINUX/osi_pag_module.c
index a315ec8fe93b4bc52ad9d6b0e6aa5c7e5106fdaa..bb0eb5718fc131d55b87978d4ecc43b745719b8a 100644 (file)
--- a/src/afs/LINUX/osi_pag_module.c
+++ b/src/afs/LINUX/osi_pag_module.c
@@ -17,8 +17,8 @@
 #include <linux/module.h> /* early to avoid printf->printk mapping */
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
-#include "h/unistd.h"          /* For syscall numbers. */
-#include "h/mm.h"
+#include <linux/unistd.h>              /* For syscall numbers. */
+#include <linux/mm.h>
 
 #ifdef AFS_AMD64_LINUX20_ENV
 #include <asm/ia32_unistd.h>

diff --git a/src/afs/LINUX/osi_proc.c b/src/afs/LINUX/osi_proc.c
index 6e370be17ca2dc7e7bdbe41b860c28f334c19e02..ed2b217291ff4ed3dbb779a72ab648e6110706d9 100644 (file)
--- a/src/afs/LINUX/osi_proc.c
+++ b/src/afs/LINUX/osi_proc.c
@@ -22,8 +22,8 @@
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #include "afs/nfsclient.h"
-#include "h/unistd.h"          /* For syscall numbers. */
-#include "h/mm.h"
+#include <linux/unistd.h>              /* For syscall numbers. */
+#include <linux/mm.h>
 
 #ifdef AFS_AMD64_LINUX20_ENV
 #include <asm/ia32_unistd.h>

diff --git a/src/afs/LINUX/osi_syscall.c b/src/afs/LINUX/osi_syscall.c
index 0a85aa6b672ea2917c0fb92166b6cceaeeb2d657..eec3464aef04dfbc37db15f24f40c7e986d4afc4 100644 (file)
--- a/src/afs/LINUX/osi_syscall.c
+++ b/src/afs/LINUX/osi_syscall.c
@@ -18,8 +18,8 @@
 #include <linux/module.h> /* early to avoid printf->printk mapping */
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
-#include "h/unistd.h"          /* For syscall numbers. */
-#include "h/mm.h"
+#include <linux/unistd.h>              /* For syscall numbers. */
+#include <linux/mm.h>
 
 #ifdef AFS_AMD64_LINUX20_ENV
 #include <asm/ia32_unistd.h>

diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c
index 8f2b4012f4b00b81d3219207559d9bb9e64806b5..aa80111e62cc24b468f754d40864fe245010baab 100644 (file)
--- a/src/afs/LINUX/osi_vfsops.c
+++ b/src/afs/LINUX/osi_vfsops.c
@@ -21,7 +21,7 @@
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #include "afs/afs_stats.h"
-#include "h/smp_lock.h"
+#include <linux/smp_lock.h>
 
 
 struct vcache *afs_globalVp = 0;

diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index c4a5490bde3a34459e18b8f4cf282384999944b0..44be0300f99b2d7007419a2bb36c5afa0b3f8103 100644 (file)
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -25,14 +25,14 @@
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #include "afs/afs_stats.h"
-#include "h/mm.h"
+#include <linux/mm.h>
 #ifdef HAVE_MM_INLINE_H
-#include "h/mm_inline.h"
+#include <linux/mm_inline.h>
 #endif
-#include "h/pagemap.h"
-#include "h/smp_lock.h"
-#include "h/writeback.h"
-#include "h/pagevec.h"
+#include <linux/pagemap.h>
+#include <linux/smp_lock.h>
+#include <linux/writeback.h>
+#include <linux/pagevec.h>
 #if defined(AFS_CACHE_BYPASS)
 #include "afs/lock.h"
 #include "afs/afs_bypasscache.h"