From f7d601eefa0b98dd54720a4639ed746039d2675c Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Fri, 2 Oct 2009 23:43:46 +0100 Subject: [PATCH] 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 convention from including kernel headers. Reviewed-on: http://gerrit.openafs.org/582 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/afs/LINUX/osi_alloc.c | 6 +++--- src/afs/LINUX/osi_export.c | 2 +- src/afs/LINUX/osi_file.c | 8 ++++---- src/afs/LINUX/osi_groups.c | 2 +- src/afs/LINUX/osi_ioctl.c | 4 ++-- src/afs/LINUX/osi_misc.c | 8 ++++---- src/afs/LINUX/osi_module.c | 4 ++-- src/afs/LINUX/osi_nfssrv.c | 2 +- src/afs/LINUX/osi_pag_module.c | 4 ++-- src/afs/LINUX/osi_proc.c | 4 ++-- src/afs/LINUX/osi_syscall.c | 4 ++-- src/afs/LINUX/osi_vfsops.c | 2 +- src/afs/LINUX/osi_vnodeops.c | 12 ++++++------ 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/afs/LINUX/osi_alloc.c b/src/afs/LINUX/osi_alloc.c index 62eb698d9..3de0767b6 100644 --- 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 +#include #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 /* Allocator support functions (static) */ diff --git a/src/afs/LINUX/osi_export.c b/src/afs/LINUX/osi_export.c index 0fb7dae48..992cc9439 100644 --- 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 #if !defined(AFS_NONFSTRANS) diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c index 4a9187c42..2b93b6cf3 100644 --- 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 /* 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 +#include #if defined(LINUX_USE_FH) -#include "h/exportfs.h" +#include 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 f78562a72..4d2dbd95c 100644 --- 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 #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 4100982ac..cb93b96d0 100644 --- a/src/afs/LINUX/osi_ioctl.c +++ b/src/afs/LINUX/osi_ioctl.c @@ -18,8 +18,8 @@ #include /* 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 /* For syscall numbers. */ +#include #ifdef AFS_AMD64_LINUX20_ENV #include diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c index 4848d94ba..18ed7eb2f 100644 --- a/src/afs/LINUX/osi_misc.c +++ b/src/afs/LINUX/osi_misc.c @@ -16,13 +16,13 @@ #include /* early to avoid printf->printk mapping */ -#include "h/dcache.h" -#include "h/namei.h" -#include "h/kthread.h" +#include +#include +#include #include "afs/sysincludes.h" #include "afsincludes.h" #include "afs/afs_stats.h" -#include "h/smp_lock.h" +#include 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 8cf1e5033..e5a25d9e9 100644 --- a/src/afs/LINUX/osi_module.c +++ b/src/afs/LINUX/osi_module.c @@ -18,8 +18,8 @@ #include /* 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 /* For syscall numbers. */ +#include #ifdef AFS_AMD64_LINUX20_ENV #include diff --git a/src/afs/LINUX/osi_nfssrv.c b/src/afs/LINUX/osi_nfssrv.c index a3df7b283..24a4b3670 100644 --- 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 #include #include diff --git a/src/afs/LINUX/osi_pag_module.c b/src/afs/LINUX/osi_pag_module.c index a315ec8fe..bb0eb5718 100644 --- a/src/afs/LINUX/osi_pag_module.c +++ b/src/afs/LINUX/osi_pag_module.c @@ -17,8 +17,8 @@ #include /* 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 /* For syscall numbers. */ +#include #ifdef AFS_AMD64_LINUX20_ENV #include diff --git a/src/afs/LINUX/osi_proc.c b/src/afs/LINUX/osi_proc.c index 6e370be17..ed2b21729 100644 --- 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 /* For syscall numbers. */ +#include #ifdef AFS_AMD64_LINUX20_ENV #include diff --git a/src/afs/LINUX/osi_syscall.c b/src/afs/LINUX/osi_syscall.c index 0a85aa6b6..eec3464ae 100644 --- a/src/afs/LINUX/osi_syscall.c +++ b/src/afs/LINUX/osi_syscall.c @@ -18,8 +18,8 @@ #include /* 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 /* For syscall numbers. */ +#include #ifdef AFS_AMD64_LINUX20_ENV #include diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c index 8f2b4012f..aa80111e6 100644 --- 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 struct vcache *afs_globalVp = 0; diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c index c4a5490bd..44be0300f 100644 --- 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 #ifdef HAVE_MM_INLINE_H -#include "h/mm_inline.h" +#include #endif -#include "h/pagemap.h" -#include "h/smp_lock.h" -#include "h/writeback.h" -#include "h/pagevec.h" +#include +#include +#include +#include #if defined(AFS_CACHE_BYPASS) #include "afs/lock.h" #include "afs/afs_bypasscache.h" -- 2.39.5