From: Pascal Terjan <pterjan@mandriva.com>
Date: Mon, 11 Jul 2005 20:13:47 +0000 (+0000)
Subject: STABLE14-coda-xfs-header-defines-fun-20050706
X-Git-Tag: openafs-devel-1_3_85~12
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=960ed96198468e175fe76f3962936eee2c1dc8e9;p=packages%2Fo%2Fopenafs.git

STABLE14-coda-xfs-header-defines-fun-20050706


make this better, we should never have been doing it as we were before


(cherry picked from commit f829393c716330b65a96d5cc0c33b2c83e9b4bc4)
---

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index 33c049db6..587288c57 100644
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -74,13 +74,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>
diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 30b490843..4cc32966d 100644
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -21,11 +21,11 @@
 #ifdef AFS_LINUX22_ENV
 #ifndef _LINUX_CODA_FS_I
 #define _LINUX_CODA_FS_I 1
-#endif
 #define _CODA_HEADER_ 1
 struct coda_inode_info {
 };
 #endif
+#endif
 #ifdef AFS_DARWIN_ENV
 #ifndef _MACH_ETAP_H_
 #define _MACH_ETAP_H_