LU-13005 lnet: eq: discard struct lnet_handle_eq

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

diff --git a/lnet/include/lnet/api.h b/lnet/include/lnet/api.h
index 1ce4a00..d89294a 100644 (file)
--- a/lnet/include/lnet/api.h
+++ b/lnet/include/lnet/api.h
@@ -93,25 +93,17 @@ bool LNetIsPeerLocal(lnet_nid_t nid);
  * and a set of match criteria. The match criteria can be used to reject
  * incoming requests based on process ID or the match bits provided in the
  * request. MEs can be dynamically inserted into a match list by LNetMEAttach()
- * and LNetMEInsert(), and removed from its list by LNetMEUnlink().
+ * and removed from its list by LNetMEUnlink().
  * @{ */
-int LNetMEAttach(unsigned int     portal,
-                struct lnet_process_id match_id_in,
-                __u64             match_bits_in,
-                __u64             ignore_bits_in,
-                enum lnet_unlink       unlink_in,
-                enum lnet_ins_pos      pos_in,
-                struct lnet_handle_me  *handle_out);
-
-int LNetMEInsert(struct lnet_handle_me current_in,
-                struct lnet_process_id match_id_in,
-                __u64             match_bits_in,
-                __u64             ignore_bits_in,
-                enum lnet_unlink  unlink_in,
-                enum lnet_ins_pos position_in,
-                struct lnet_handle_me *handle_out);
-
-int LNetMEUnlink(struct lnet_handle_me current_in);
+struct lnet_me *
+LNetMEAttach(unsigned int portal,
+            struct lnet_process_id match_id_in,
+            __u64 match_bits_in,
+            __u64 ignore_bits_in,
+            enum lnet_unlink unlink_in,
+            enum lnet_ins_pos pos_in);
+
+void LNetMEUnlink(struct lnet_me *current_in);
 /** @} lnet_me */
 
 /** \defgroup lnet_md Memory descriptors
@@ -126,9 +118,9 @@ int LNetMEUnlink(struct lnet_handle_me current_in);
  * and LNetMDBind(); one operation to unlink and release the resources
  * associated with a MD: LNetMDUnlink().
  * @{ */
-int LNetMDAttach(struct lnet_handle_me current_in,
-                struct lnet_md    md_in,
-                enum lnet_unlink  unlink_in,
+int LNetMDAttach(struct lnet_me *current_in,
+                struct lnet_md md_in,
+                enum lnet_unlink unlink_in,
                 struct lnet_handle_md *md_handle_out);
 
 int LNetMDBind(struct lnet_md   md_in,
@@ -148,35 +140,27 @@ int LNetMDUnlink(struct lnet_handle_md md_in);
  * associated with it. If an event handler exists, it will be run for each
  * event that is deposited into the EQ.
  *
- * In addition to the struct lnet_handle_eq, the LNet API defines two types
+ * In addition to the struct lnet_eq, the LNet API defines two types
  * associated with events: The ::lnet_event_kind defines the kinds of events
  * that can be stored in an EQ. The struct lnet_event defines a structure that
  * holds the information about with an event.
  *
- * There are five functions for dealing with EQs: LNetEQAlloc() is used to
- * create an EQ and allocate the resources needed, while LNetEQFree()
- * releases these resources and free the EQ. LNetEQGet() retrieves the next
- * event from an EQ, and LNetEQWait() can be used to block a process until
- * an EQ has at least one event. LNetEQPoll() can be used to test or wait
- * on multiple EQs.
+ * There are three functions for dealing with EQs: LNetEQAlloc() is used
+ * to create an EQ and allocate the resources needed, while LNetEQFree()
+ * releases these resources and free the EQ.  LNetEQPoll() can be used
+ * to test or wait on multiple EQs.
  * @{ */
-int LNetEQAlloc(unsigned int      count_in,
-               lnet_eq_handler_t  handler,
-               struct lnet_handle_eq *handle_out);
+struct lnet_eq *
+LNetEQAlloc(unsigned int count_in,
+           lnet_eq_handler_t handler);
 
-int LNetEQFree(struct lnet_handle_eq eventq_in);
+int LNetEQFree(struct lnet_eq *eventq_in);
 
-int LNetEQGet(struct lnet_handle_eq eventq_in,
-             struct lnet_event *event_out);
-
-int LNetEQWait(struct lnet_handle_eq eventq_in,
-              struct lnet_event *event_out);
-
-int LNetEQPoll(struct lnet_handle_eq *eventqs_in,
-              int               neq_in,
-              signed long       timeout,
+int LNetEQPoll(struct lnet_eq **eventqs_in,
+              int neq_in,
+              signed long timeout,
               struct lnet_event *event_out,
-              int              *which_eq_out);
+              int *which_eq_out);
 /** @} lnet_eq */
 
 /** \defgroup lnet_data Data movement operations