LU-13005 lnet: remove lib-eq.

[fs/lustre-release.git] / lnet / selftest / rpc.c

diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c
index 57d21e2..71fa157 100644 (file)
--- a/lnet/selftest/rpc.c
+++ b/lnet/selftest/rpc.c
@@ -53,7 +53,7 @@ enum srpc_state {
 static struct smoketest_rpc {
        spinlock_t       rpc_glock;     /* global lock */
        struct srpc_service     *rpc_services[SRPC_SERVICE_MAX_ID + 1];
-       struct lnet_eq          *rpc_lnet_eq;   /* _the_ LNet event queue */
+       lnet_eq_handler_t        rpc_lnet_eq;   /* _the_ LNet event handler */
        enum srpc_state          rpc_state;
        struct srpc_counters     rpc_counters;
        __u64                    rpc_matchbits; /* matchbits counter */
@@ -1621,12 +1621,7 @@ srpc_startup (void)
 
        srpc_data.rpc_state = SRPC_STATE_NI_INIT;
 
-       srpc_data.rpc_lnet_eq = LNetEQAlloc(srpc_lnet_ev_handler);
-       if (IS_ERR(srpc_data.rpc_lnet_eq)) {
-               rc = PTR_ERR(srpc_data.rpc_lnet_eq);
-               CERROR("LNetEQAlloc() has failed: %d\n", rc);
-               goto bail;
-       }
+       srpc_data.rpc_lnet_eq = srpc_lnet_ev_handler;
 
        rc = LNetSetLazyPortal(SRPC_FRAMEWORK_REQUEST_PORTAL);
        LASSERT(rc == 0);
@@ -1637,7 +1632,6 @@ srpc_startup (void)
 
        rc = stt_startup();
 
-bail:
        if (rc != 0)
                srpc_shutdown();
        else
@@ -1680,7 +1674,6 @@ srpc_shutdown (void)
                rc = LNetClearLazyPortal(SRPC_FRAMEWORK_REQUEST_PORTAL);
                rc = LNetClearLazyPortal(SRPC_REQUEST_PORTAL);
                LASSERT(rc == 0);
-               LNetEQFree(srpc_data.rpc_lnet_eq);
                /* fallthrough */
 
        case SRPC_STATE_NI_INIT: