land portals part of b_hd_sec on HEAD.

[fs/lustre-release.git] / lnet / include / lnet / types.h

diff --git a/lnet/include/lnet/types.h b/lnet/include/lnet/types.h
index 51b557c..f07534b 100644 (file)
--- a/lnet/include/lnet/types.h
+++ b/lnet/include/lnet/types.h
@@ -3,28 +3,7 @@
 
 #include "build_check.h"
 
-#ifdef __linux__
-# include <asm/types.h>
-# if defined(__powerpc__) && !defined(__KERNEL__)
-#  define __KERNEL__
-#  include <asm/timex.h>
-#  undef __KERNEL__
-# else
-#  include <asm/timex.h>
-# endif
-#else
-# include <sys/types.h>
-typedef u_int32_t __u32;
-typedef u_int64_t __u64;
-#endif
-
-#ifdef __KERNEL__
-# include <linux/time.h>
-#else
-# include <sys/time.h>
-# define do_gettimeofday(tv) gettimeofday(tv, NULL);
-#endif
-
+#include <libcfs/libcfs.h>
 #include <portals/errno.h>
 
 /* This implementation uses the same type for API function return codes and
@@ -32,7 +11,10 @@ typedef u_int64_t __u64;
 #define PTL_NI_OK  PTL_OK
 typedef ptl_err_t ptl_ni_fail_t;
 
+typedef __u32 ptl_uid_t;
+typedef __u32 ptl_jid_t;
 typedef __u64 ptl_nid_t;
+typedef __u32 ptl_netid_t;
 typedef __u32 ptl_pid_t;
 typedef __u32 ptl_pt_index_t;
 typedef __u32 ptl_ac_index_t;
@@ -61,6 +43,8 @@ static inline int PtlHandleIsEqual (ptl_handle_any_t h1, ptl_handle_any_t h2)
        return (h1.nal_idx == h2.nal_idx && h1.cookie == h2.cookie);
 }
 
+#define PTL_UID_ANY      ((ptl_uid_t) -1)
+#define PTL_JID_ANY      ((ptl_jid_t) -1)
 #define PTL_NID_ANY      ((ptl_nid_t) -1)
 #define PTL_PID_ANY      ((ptl_pid_t) -1)
 
@@ -86,7 +70,7 @@ typedef struct {
         int              max_size;
         unsigned int     options;
         void            *user_ptr;
-        ptl_handle_eq_t  eventq;
+        ptl_handle_eq_t  eq_handle;
 } ptl_md_t;
 
 /* Options for the MD structure */
@@ -112,7 +96,7 @@ typedef struct {
 typedef struct iovec ptl_md_iovec_t;
 
 typedef struct {
-       struct page     *kiov_page;
+       cfs_page_t      *kiov_page;
        unsigned int     kiov_len;
        unsigned int     kiov_offset;
 } ptl_kiov_t;
@@ -149,15 +133,20 @@ typedef unsigned PTL_SEQ_BASETYPE ptl_seq_t;
 typedef struct {
         ptl_event_kind_t   type;
         ptl_process_id_t   initiator;
-        ptl_pt_index_t     portal;
+        ptl_uid_t          uid;
+        ptl_jid_t          jid;
+        ptl_pt_index_t     pt_index;
         ptl_match_bits_t   match_bits;
         ptl_size_t         rlength;
-       ptl_size_t         mlength;
-       ptl_size_t         offset;
-        ptl_md_t           mem_desc;
+        ptl_size_t         mlength;
+        ptl_size_t         offset;
+        ptl_handle_md_t    md_handle;
+        ptl_md_t           md;
         ptl_hdr_data_t     hdr_data;
-       int                unlinked;
-       ptl_ni_fail_t      ni_fail_type;
+        ptl_seq_t          link;
+        ptl_ni_fail_t      ni_fail_type;
+
+        int                unlinked;
 
         volatile ptl_seq_t sequence;
 } ptl_event_t;
@@ -174,17 +163,6 @@ typedef void (*ptl_eq_handler_t)(ptl_event_t *event);
 #define PTL_EQ_HANDLER_NONE NULL
 
 typedef struct {
-        volatile ptl_seq_t sequence;
-        ptl_size_t size;
-        ptl_event_t *base;
-        ptl_handle_any_t cb_eq_handle;
-} ptl_eq_t;
-
-typedef struct {
-        ptl_eq_t *eq;
-} ptl_ni_t;
-
-typedef struct {
        int max_mes;
        int max_mds;
        int max_eqs;