LU-6142 lnet: remove most of typedefs from LNet headers

[fs/lustre-release.git] / lnet / lnet / lib-eq.c

diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c
index 4ff2ba6..c827e65 100644 (file)
--- a/lnet/lnet/lib-eq.c
+++ b/lnet/lnet/lib-eq.c
@@ -64,9 +64,9 @@
  */
 int
 LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback,
-           lnet_handle_eq_t *handle)
+           struct lnet_handle_eq *handle)
 {
-       lnet_eq_t     *eq;
+       struct lnet_eq *eq;
 
        LASSERT(the_lnet.ln_refcount > 0);
 
@@ -94,7 +94,7 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback,
                return -ENOMEM;
 
        if (count != 0) {
-               LIBCFS_ALLOC(eq->eq_events, count * sizeof(lnet_event_t));
+               LIBCFS_ALLOC(eq->eq_events, count * sizeof(struct lnet_event));
                if (eq->eq_events == NULL)
                        goto failed;
                /* NB allocator has set all event sequence numbers to 0,
@@ -128,7 +128,7 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback,
 
 failed:
        if (eq->eq_events != NULL)
-               LIBCFS_FREE(eq->eq_events, count * sizeof(lnet_event_t));
+               LIBCFS_FREE(eq->eq_events, count * sizeof(struct lnet_event));
 
        if (eq->eq_refs != NULL)
                cfs_percpt_free(eq->eq_refs);
@@ -149,10 +149,10 @@ EXPORT_SYMBOL(LNetEQAlloc);
  * \retval -EBUSY  If the EQ is still in use by some MDs.
  */
 int
-LNetEQFree(lnet_handle_eq_t eqh)
+LNetEQFree(struct lnet_handle_eq eqh)
 {
        struct lnet_eq  *eq;
-       lnet_event_t    *events = NULL;
+       struct lnet_event       *events = NULL;
        int             **refs = NULL;
        int             *ref;
        int             rc = 0;
@@ -196,7 +196,7 @@ LNetEQFree(lnet_handle_eq_t eqh)
        lnet_res_unlock(LNET_LOCK_EX);
 
        if (events != NULL)
-               LIBCFS_FREE(events, size * sizeof(lnet_event_t));
+               LIBCFS_FREE(events, size * sizeof(struct lnet_event));
        if (refs != NULL)
                cfs_percpt_free(refs);
 
@@ -205,7 +205,7 @@ LNetEQFree(lnet_handle_eq_t eqh)
 EXPORT_SYMBOL(LNetEQFree);
 
 void
-lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev)
+lnet_eq_enqueue_event(struct lnet_eq *eq, struct lnet_event *ev)
 {
        /* MUST called with resource lock hold but w/o lnet_eq_wait_lock */
        int index;
@@ -234,10 +234,10 @@ lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev)
 }
 
 static int
-lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev)
+lnet_eq_dequeue_event(struct lnet_eq *eq, struct lnet_event *ev)
 {
        int             new_index = eq->eq_deq_seq & (eq->eq_size - 1);
-       lnet_event_t    *new_event = &eq->eq_events[new_index];
+       struct lnet_event       *new_event = &eq->eq_events[new_index];
        int             rc;
        ENTRY;
 
@@ -283,7 +283,7 @@ lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev)
  * EQ has been dropped due to limited space in the EQ.
  */
 int
-LNetEQGet (lnet_handle_eq_t eventq, lnet_event_t *event)
+LNetEQGet(struct lnet_handle_eq eventq, struct lnet_event *event)
 {
        int which;
 
@@ -309,7 +309,7 @@ EXPORT_SYMBOL(LNetEQGet);
  * EQ has been dropped due to limited space in the EQ.
  */
 int
-LNetEQWait (lnet_handle_eq_t eventq, lnet_event_t *event)
+LNetEQWait(struct lnet_handle_eq eventq, struct lnet_event *event)
 {
        int which;
 
@@ -371,8 +371,8 @@ __must_hold(&the_lnet.ln_eq_wait_lock)
  * \retval -ENOENT    If there's an invalid handle in \a eventqs.
  */
 int
-LNetEQPoll(lnet_handle_eq_t *eventqs, int neq, signed long timeout,
-          lnet_event_t *event, int *which)
+LNetEQPoll(struct lnet_handle_eq *eventqs, int neq, signed long timeout,
+          struct lnet_event *event, int *which)
 {
        int     wait = 1;
        int     rc;
@@ -388,7 +388,7 @@ LNetEQPoll(lnet_handle_eq_t *eventqs, int neq, signed long timeout,
 
        for (;;) {
                for (i = 0; i < neq; i++) {
-                       lnet_eq_t *eq = lnet_handle2eq(&eventqs[i]);
+                       struct lnet_eq *eq = lnet_handle2eq(&eventqs[i]);
 
                        if (eq == NULL) {
                                lnet_eq_wait_unlock();