linux-updates-20060309

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

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 33c049d..e67c7bc 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>
@@ -74,13 +76,16 @@
  */
 #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>
@@ -92,6 +97,9 @@ struct xfs_inode_info {
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <asm/semaphore.h>
+#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>
@@ -214,7 +222,7 @@ typedef unsigned short etap_event_t;
 #  include "h/dir.h"
 #endif /* SGI || SUN || HPUX */
 
-#if !defined(AFS_SGI64_ENV) && !defined(AFS_FBSD_ENV)
+#if !defined(AFS_SGI64_ENV) && !defined(AFS_FBSD_ENV) && !defined(AFS_DARWIN80_ENV)
 #include "h/user.h"
 #endif /* AFS_SGI64_ENV */
 #define        MACH_USER_API   1
@@ -251,6 +259,10 @@ struct vop_getwritemount_args;
 #  include <sys/uio.h>
 #  include <sys/mount.h>
 #  include <sys/namei.h>
+#ifdef AFS_DARWIN80_ENV
+#  include <sys/kauth.h>
+#include <string.h>
+#endif
 #  include <sys/vnode.h>
 #  include <sys/queue.h>
 #  include <sys/malloc.h>
@@ -271,9 +283,11 @@ MALLOC_DECLARE(M_AFS);
 #undef timeout_fcn_t
 #define _DIR_H_
 #define doff_t          int32_t
+#ifndef AFS_DARWIN80_ENV
 #  include <ufs/ufs/quota.h>
 #  include <ufs/ufs/inode.h>
 #  include <ufs/ffs/fs.h>
+#endif
 #else
 #  include "h/vfs.h"
 #  include "h/vnode.h"