* Fix XT3 build errors on Catamount (that were already resolved on Linux XT3 build...

diff --git a/lnet/include/lnet/ptllnd.h b/lnet/include/lnet/ptllnd.h
new file mode 100755 (executable)
index 0000000..2d3a63e
--- /dev/null
+++ b/lnet/include/lnet/ptllnd.h
@@ -0,0 +1,65 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * Copyright (C) 2005 Cluster File Systems, Inc. All rights reserved.
+ *   Author: PJ Kirner <pjkirner@clusterfs.com>
+ *
+ *   This file is part of the Lustre file system, http://www.lustre.org
+ *   Lustre is a trademark of Cluster File Systems, Inc.
+ *
+ *   This file is confidential source code owned by Cluster File Systems.
+ *   No viewing, modification, compilation, redistribution, or any other
+ *   form of use is permitted except through a signed license agreement.
+ *
+ *   If you have not signed such an agreement, then you have no rights to
+ *   this file.  Please destroy it immediately and contact CFS.
+ *
+ */
+ 
+/*
+ * The PTLLND was designed to support Portals with
+ * Lustre and non-lustre UNLINK semantics.
+ * However for now the two targets are Cray Portals
+ * on the XT3 and Lustre Portals (for testing) both
+ * have Lustre UNLINK semantics, so this is defined
+ * by default.
+ */
+#define LUSTRE_PORTALS_UNLINK_SEMANTICS
+ 
+ 
+#ifdef _USING_LUSTRE_PORTALS_
+
+/* NIDs are 64-bits on Lustre Portals */
+#define FMT_NID LPX64
+
+/* When using Lustre Portals Lustre completion semantics are imlicit*/
+#define PTL_MD_LUSTRE_COMPLETION_SEMANTICS      0
+
+#else /* _USING_CRAY_PORTALS_ */
+
+/* NIDs are integers on Lustre Portals */
+#define FMT_NID "%x"
+
+/* When using Cray Portals this is defined in the Cray Portals Header*/
+/*#define PTL_MD_LUSTRE_COMPLETION_SEMANTICS */
+
+/* Can compare handles directly on Cray Portals */
+#define PtlHandleIsEqual(a,b) (a == b)
+
+/* Diffrent error types on Cray Portals*/
+#define ptl_err_t ptl_ni_fail_t
+
+
+/*
+ * The Cray Portals has no maximum number of IOVs.  The
+ * maximum is limited only my memory and size of the
+ * int parameters (2^31-1).
+ * Lustre only really require that the underyling
+ * implemenation to support at least LNET_MAX_IOV,
+ * so for Cray portals we can safely just use that
+ * value here.
+ *
+ */
+#define PTL_MD_MAX_IOV          LNET_MAX_IOV
+
+#endif

diff --git a/lnet/klnds/ptllnd/ptllnd.h b/lnet/klnds/ptllnd/ptllnd.h
index b8da04f..00db185 100755 (executable)
--- a/lnet/klnds/ptllnd/ptllnd.h
+++ b/lnet/klnds/ptllnd/ptllnd.h
@@ -54,17 +54,7 @@
 #include <lnet/lnet.h>
 #include <lnet/lib-lnet.h>
 #include <portals/p30.h>
-
-/*
- * The PTLLND was designed to support Portals with
- * Lustre and non-lustre UNLINK semantics.
- * However for now the two targets are Cray Portals
- * on the XT3 and Lustre Portals (for testing) both
- * have Lustre UNLINK semantics, so this is defined
- * by default.
- */
-#define LUSTRE_PORTALS_UNLINK_SEMANTICS
-
+#include <lnet/ptllnd.h>        /* Depends on portals/p30.h */
 
 /*
  * Define this to enable console debug logging
@@ -72,43 +62,6 @@
  */
 //#define PJK_DEBUGGING
 
-#ifdef _USING_LUSTRE_PORTALS_
-
-/* NIDs are 64-bits on Lustre Portals */
-#define FMT_NID LPX64
-
-/* When using Lustre Portals Lustre completion semantics are imlicit*/
-#define PTL_MD_LUSTRE_COMPLETION_SEMANTICS      0
-
-#else /* _USING_CRAY_PORTALS_ */
-
-/* NIDs are integers on Lustre Portals */
-#define FMT_NID "%x"
-
-/* When using Cray Portals this is defined in the Cray Portals Header*/
-/*#define PTL_MD_LUSTRE_COMPLETION_SEMANTICS */
-
-/* Can compare handles directly on Cray Portals */
-#define PtlHandleIsEqual(a,b) (a == b)
-
-/* Diffrent error types on Cray Portals*/
-#define ptl_err_t ptl_ni_fail_t
-
-
-/*
- * The Cray Portals has no maximum number of IOVs.  The
- * maximum is limited only my memory and size of the
- * int parameters (2^31-1).
- * Lustre only really require that the underyling
- * implemenation to support at least LNET_MAX_IOV,
- * so for Cray portals we can safely just use that
- * value here.
- *
- */
-#define PTL_MD_MAX_IOV          LNET_MAX_IOV
-
-#endif
-
 #if CONFIG_SMP
 # define PTLLND_N_SCHED         num_online_cpus()   /* # schedulers */
 #else

diff --git a/lnet/ulnds/ptllnd/ptllnd.h b/lnet/ulnds/ptllnd/ptllnd.h
index 715804c..b1e2126 100644 (file)
--- a/lnet/ulnds/ptllnd/ptllnd.h
+++ b/lnet/ulnds/ptllnd/ptllnd.h
@@ -23,8 +23,8 @@
 #include <lnet/ptllnd_wire.h>
 
 #include <portals/p30.h>
+#include <lnet/ptllnd.h>           /* Depends on portals/p30.h */
 
-#define LUSTRE_PORTALS_UNLINK_SEMANTICS
 
 #define PTLLND_MSGS_PER_BUFFER     64
 #define PTLLND_MSGS_SPARE          256
@@ -32,13 +32,8 @@
 #define PTLLND_EQ_SIZE             1024
 #define PTLLND_NTX                 256
 
-#ifdef PTL_MD_LUSTRE_COMPLETION_SEMANTICS
-# define PTLLND_MD_OPTIONS        (PTL_MD_LUSTRE_COMPLETION_SEMANTICS |\
-                                   PTL_MD_EVENT_START_DISABLE)
-#else
-# define PTLLND_MD_OPTIONS         PTL_MD_EVENT_START_DISABLE
-#endif   
-                                     
+#define PTLLND_MD_OPTIONS        (PTL_MD_LUSTRE_COMPLETION_SEMANTICS |\
+                                  PTL_MD_EVENT_START_DISABLE)
 typedef struct
 {
         int                        plni_portal;