linux-2-6-27-20080816

[openafs.git] / src / afs / sysincludes.h

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index ade3cdc..6949b9d 100644 (file)
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -39,7 +39,9 @@
 #include <ufs/ffs/fs.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
+#ifndef AFS_OBSD38_ENV
 #include <ufs/ufs/extattr.h>
+#endif
 #include <ufs/ufs/ufsmount.h>
 #ifndef MLEN
 #include <sys/mbuf.h>
@@ -51,7 +53,9 @@
 #else /* AFS_OBSD_ENV */
 #ifdef AFS_LINUX22_ENV
 #include <linux/version.h>
+#ifdef CONFIG_H_EXISTS
 #include <linux/config.h>
+#endif
 #include <linux/linkage.h>
 #include <linux/limits.h>
 #include <linux/wait.h>
@@ -68,19 +72,32 @@
 #include <linux/security.h>
 #endif
 #include <linux/suspend.h>
+#if defined(LINUX_KEYRING_SUPPORT)
+#include <linux/rwsem.h>
+#include <linux/key.h>
+#if defined(KEY_TYPE_H_EXISTS)
+#include <linux/key-type.h>
+#endif
+#ifndef KEY_ALLOC_IN_QUOTA
+#define KEY_ALLOC_IN_QUOTA 1
+#endif
+#endif
 #endif
 /* Avoid conflicts with coda overloading AFS type namespace. Must precede
  * inclusion of uaccess.h.
  */
 #ifndef _LINUX_CODA_FS_I
 #define _LINUX_CODA_FS_I
-#endif
+#define _CODA_HEADER_
 #define _CFS_HEADER_
 struct coda_inode_info {
 };
+#endif
+#ifndef _LINUX_XFS_FS_I
 #define _LINUX_XFS_FS_I
 struct xfs_inode_info {
 };
+#endif
 #include <asm/uaccess.h>
 #include <linux/list.h>
 #include <linux/dcache.h>
@@ -91,7 +108,14 @@ struct xfs_inode_info {
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#if defined(LINUX_SEMAPHORE_H)
+#include <linux/semaphore.h>
+#else
 #include <asm/semaphore.h>
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+#include <linux/mutex.h>
+#endif
 #include <linux/errno.h>
 #ifdef COMPLETION_H_EXISTS
 #include <linux/completion.h>
@@ -152,9 +176,6 @@ typedef unsigned short etap_event_t;
 #endif
 #endif /* AFS_SGI64_ENV */
 #include "fs/efs_inode.h"
-#ifdef AFS_SGI_EFS_IOPS_ENV
-#include "sgiefs/efs.h"
-#endif
 #include "sys/kmem.h"
 #include "sys/cred.h"
 #include "sys/resource.h"
@@ -198,6 +219,7 @@ typedef unsigned short etap_event_t;
 
 #ifdef AFS_SUN510_ENV
 #include <sys/cred_impl.h>
+#include <sys/policy.h>
 #endif
 
 #include "h/socket.h"
@@ -252,10 +274,10 @@ struct vop_getwritemount_args;
 #  include <sys/mount.h>
 #  include <sys/namei.h>
 #ifdef AFS_DARWIN80_ENV
-#  include <h/vnode.h>
-#else
-#  include <sys/vnode.h>
+#  include <sys/kauth.h>
+#include <string.h>
 #endif
+#  include <sys/vnode.h>
 #  include <sys/queue.h>
 #  include <sys/malloc.h>
 #ifndef AFS_FBSD_ENV