X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Flib-eq.c;h=50ac435e9ed8c7f6fde92aa65c4dcf4911d64d05;hp=f9dcaa1fc54edcd2dec64825fd56200a0b73cb26;hb=48a0697d79101ad3ff7651779808dcf002a68890;hpb=e089a515efae3391709b997be889ebe0f3306e9d diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c index f9dcaa1..50ac435 100644 --- a/lnet/lnet/lib-eq.c +++ b/lnet/lnet/lib-eq.c @@ -122,7 +122,7 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback, lnet_eq_wait_lock(); lnet_res_lh_initialize(&the_lnet.ln_eq_container, &eq->eq_lh); - cfs_list_add(&eq->eq_list, &the_lnet.ln_eq_container.rec_active); + list_add(&eq->eq_list, &the_lnet.ln_eq_container.rec_active); lnet_eq_wait_unlock(); lnet_res_unlock(LNET_LOCK_EX); @@ -194,7 +194,7 @@ LNetEQFree(lnet_handle_eq_t eqh) refs = eq->eq_refs; lnet_res_lh_invalidate(&eq->eq_lh); - cfs_list_del(&eq->eq_list); + list_del(&eq->eq_list); lnet_eq_free_locked(eq); out: lnet_eq_wait_unlock(); @@ -247,7 +247,7 @@ lnet_eq_enqueue_event(lnet_eq_t *eq, lnet_event_t *ev) lnet_eq_wait_unlock(); } -int +static int lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev) { int new_index = eq->eq_deq_seq & (eq->eq_size - 1); @@ -336,6 +336,7 @@ EXPORT_SYMBOL(LNetEQWait); static int lnet_eq_wait_locked(int *timeout_ms) +__must_hold(&the_lnet.ln_eq_wait_lock) { int tms = *timeout_ms; int wait;