LU-6245 libcfs: remove libcfsutil.h

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

diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c
index 9296c8b..b5bd9e5 100644 (file)
--- a/lnet/selftest/framework.c
+++ b/lnet/selftest/framework.c
@@ -103,7 +103,7 @@ do {                                    \
 #define sfw_test_active(t)      (atomic_read(&(t)->tsi_nactive) != 0)
 #define sfw_batch_active(b)     (atomic_read(&(b)->bat_nactive) != 0)
 
-struct smoketest_framework {
+static struct smoketest_framework {
        /* RPCs to be recycled */
        struct list_head        fw_zombie_rpcs;
        /* stopping sessions */
@@ -165,7 +165,7 @@ sfw_register_test (srpc_service_t *service, sfw_test_client_ops_t *cliops)
        return 0;
 }
 
-void
+static void
 sfw_add_session_timer (void)
 {
         sfw_session_t *sn = sfw_data.fw_session;
@@ -185,7 +185,7 @@ sfw_add_session_timer (void)
         return;
 }
 
-int
+static int
 sfw_del_session_timer (void)
 {
         sfw_session_t *sn = sfw_data.fw_session;
@@ -200,10 +200,6 @@ sfw_del_session_timer (void)
                 return 0;
         }
 
-#ifndef __KERNEL__
-        /* Racing is impossible in single-threaded userland selftest */
-        LBUG();
-#endif
         return EBUSY; /* racing with sfw_session_expired() */
 }
 
@@ -251,17 +247,8 @@ __must_hold(&sfw_data.fw_lock)
        spin_lock(&sfw_data.fw_lock);
 }
 
-#ifndef __KERNEL__
-
-int
-sfw_session_removed (void)
-{
-        return (sfw_data.fw_session == NULL) ? 1 : 0;
-}
 
-#endif
-
-void
+static void
 sfw_session_expired (void *data)
 {
        sfw_session_t *sn = data;
@@ -307,7 +294,7 @@ sfw_init_session(sfw_session_t *sn, lst_sid_t sid,
 }
 
 /* completion handler for incoming framework RPCs */
-void
+static void
 sfw_server_rpc_done(struct srpc_server_rpc *rpc)
 {
        struct srpc_service     *sv     = rpc->srpc_scd->scd_svc;
@@ -325,15 +312,12 @@ sfw_server_rpc_done(struct srpc_server_rpc *rpc)
         return;
 }
 
-void
+static void
 sfw_client_rpc_fini (srpc_client_rpc_t *rpc)
 {
        LASSERT(rpc->crpc_bulk.bk_niov == 0);
        LASSERT(list_empty(&rpc->crpc_list));
        LASSERT(atomic_read(&rpc->crpc_refcount) == 0);
-#ifndef __KERNEL__
-       LASSERT(rpc->crpc_bulk.bk_pages == NULL);
-#endif
 
        CDEBUG(D_NET, "Outgoing framework RPC done: "
               "service %d, peer %s, status %s:%d:%d\n",
@@ -350,7 +334,7 @@ sfw_client_rpc_fini (srpc_client_rpc_t *rpc)
        spin_unlock(&sfw_data.fw_lock);
 }
 
-sfw_batch_t *
+static sfw_batch_t *
 sfw_find_batch (lst_bid_t bid)
 {
        sfw_session_t *sn = sfw_data.fw_session;
@@ -366,7 +350,7 @@ sfw_find_batch (lst_bid_t bid)
        return NULL;
 }
 
-sfw_batch_t *
+static sfw_batch_t *
 sfw_bid2batch (lst_bid_t bid)
 {
         sfw_session_t *sn = sfw_data.fw_session;
@@ -379,7 +363,7 @@ sfw_bid2batch (lst_bid_t bid)
                 return bat;
 
         LIBCFS_ALLOC(bat, sizeof(sfw_batch_t));
-        if (bat == NULL) 
+       if (bat == NULL)
                 return NULL;
 
        bat->bat_error   = 0;
@@ -392,7 +376,7 @@ sfw_bid2batch (lst_bid_t bid)
        return bat;
 }
 
-int
+static int
 sfw_get_stats (srpc_stat_reqst_t *request, srpc_stat_reply_t *reply)
 {
         sfw_session_t  *sn = sfw_data.fw_session;
@@ -504,7 +488,7 @@ sfw_make_session(srpc_mksn_reqst_t *request, srpc_mksn_reply_t *reply)
        return 0;
 }
 
-int
+static int
 sfw_remove_session (srpc_rmsn_reqst_t *request, srpc_rmsn_reply_t *reply)
 {
         sfw_session_t *sn = sfw_data.fw_session;
@@ -536,7 +520,7 @@ sfw_remove_session (srpc_rmsn_reqst_t *request, srpc_rmsn_reply_t *reply)
        return 0;
 }
 
-int
+static int
 sfw_debug_session (srpc_debug_reqst_t *request, srpc_debug_reply_t *reply)
 {
         sfw_session_t *sn = sfw_data.fw_session;
@@ -545,7 +529,7 @@ sfw_debug_session (srpc_debug_reqst_t *request, srpc_debug_reply_t *reply)
                 reply->dbg_status = ESRCH;
                 reply->dbg_sid    = LST_INVALID_SID;
                 return 0;
-        } 
+       }
 
        reply->dbg_status  = 0;
        reply->dbg_sid     = sn->sn_id;
@@ -557,7 +541,7 @@ sfw_debug_session (srpc_debug_reqst_t *request, srpc_debug_reply_t *reply)
         return 0;
 }
 
-void
+static void
 sfw_test_rpc_fini (srpc_client_rpc_t *rpc)
 {
        sfw_test_unit_t     *tsu = rpc->crpc_priv;
@@ -585,7 +569,7 @@ sfw_test_buffers(sfw_test_instance_t *tsi)
        return max(SFW_TEST_WI_MIN, nbuf + SFW_TEST_WI_EXTRA);
 }
 
-int
+static int
 sfw_load_test(struct sfw_test_instance *tsi)
 {
        struct sfw_test_case    *tsc;
@@ -622,7 +606,7 @@ sfw_load_test(struct sfw_test_instance *tsi)
        return 0;
 }
 
-void
+static void
 sfw_unload_test(struct sfw_test_instance *tsi)
 {
        struct sfw_test_case *tsc;
@@ -642,7 +626,7 @@ sfw_unload_test(struct sfw_test_instance *tsi)
        return;
 }
 
-void
+static void
 sfw_destroy_test_instance (sfw_test_instance_t *tsi)
 {
         srpc_client_rpc_t *rpc;
@@ -676,7 +660,7 @@ clean:
        return;
 }
 
-void
+static void
 sfw_destroy_batch (sfw_batch_t *tsb)
 {
        sfw_test_instance_t *tsi;
@@ -715,7 +699,7 @@ sfw_destroy_session (sfw_session_t *sn)
        return;
 }
 
-void
+static void
 sfw_unpack_addtest_req(srpc_msg_t *msg)
 {
         srpc_test_reqst_t *req = &msg->msg_body.tes_reqst;
@@ -760,7 +744,7 @@ sfw_unpack_addtest_req(srpc_msg_t *msg)
        return;
 }
 
-int
+static int
 sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc)
 {
         srpc_msg_t          *msg = &rpc->srpc_reqstbuf->buf_msg;
@@ -809,9 +793,6 @@ sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc)
        }
 
         LASSERT (bk != NULL);
-#ifndef __KERNEL__
-        LASSERT (bk->bk_pages != NULL);
-#endif
         LASSERT (bk->bk_niov * SFW_ID_PER_PAGE >= (unsigned int)ndest);
        LASSERT((unsigned int)bk->bk_len >=
                sizeof(lnet_process_id_packed_t) * ndest);
@@ -824,12 +805,8 @@ sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc)
                 lnet_process_id_packed_t  id;
                 int                       j;
 
-#ifdef __KERNEL__
                dests = page_address(bk->bk_iovs[i / SFW_ID_PER_PAGE].kiov_page);
                LASSERT (dests != NULL);  /* my pages are within KVM always */
-#else
-               dests = page_address(bk->bk_pages[i / SFW_ID_PER_PAGE]);
-#endif
                 id = dests[i % SFW_ID_PER_PAGE];
                 if (msg->msg_magic != SRPC_MSG_MAGIC)
                         sfw_unpack_id(id);
@@ -906,7 +883,7 @@ sfw_test_unit_done (sfw_test_unit_t *tsu)
        return;
 }
 
-void
+static void
 sfw_test_rpc_done (srpc_client_rpc_t *rpc)
 {
         sfw_test_unit_t     *tsu = rpc->crpc_priv;
@@ -985,7 +962,7 @@ sfw_create_test_rpc(sfw_test_unit_t *tsu, lnet_process_id_t peer,
        return 0;
 }
 
-int
+static int
 sfw_run_test (swi_workitem_t *wi)
 {
         sfw_test_unit_t     *tsu = wi->swi_workitem.wi_data;
@@ -1034,7 +1011,7 @@ test_done:
        return 1;
 }
 
-int
+static int
 sfw_run_batch (sfw_batch_t *tsb)
 {
         swi_workitem_t      *wi;
@@ -1112,7 +1089,7 @@ sfw_stop_batch (sfw_batch_t *tsb, int force)
        return 0;
 }
 
-int
+static int
 sfw_query_batch (sfw_batch_t *tsb, int testidx, srpc_batch_reply_t *reply)
 {
         sfw_test_instance_t *tsi;
@@ -1157,7 +1134,7 @@ sfw_alloc_pages(struct srpc_server_rpc *rpc, int cpt, int npages, int len,
        return 0;
 }
 
-int
+static int
 sfw_add_test (srpc_server_rpc_t *rpc)
 {
         sfw_session_t     *sn = sfw_data.fw_session;
@@ -1227,7 +1204,7 @@ sfw_add_test (srpc_server_rpc_t *rpc)
         return 0;
 }
 
-int
+static int
 sfw_control_batch (srpc_batch_reqst_t *request, srpc_batch_reply_t *reply)
 {
         sfw_session_t *sn = sfw_data.fw_session;
@@ -1268,7 +1245,7 @@ sfw_control_batch (srpc_batch_reqst_t *request, srpc_batch_reply_t *reply)
         return 0;
 }
 
-int
+static int
 sfw_handle_server_rpc(struct srpc_server_rpc *rpc)
 {
        struct srpc_service     *sv = rpc->srpc_scd->scd_svc;
@@ -1366,20 +1343,15 @@ sfw_handle_server_rpc(struct srpc_server_rpc *rpc)
        rpc->srpc_done = sfw_server_rpc_done;
        spin_lock(&sfw_data.fw_lock);
 
-#ifdef __KERNEL__
        if (!sfw_data.fw_shuttingdown)
                sfw_add_session_timer();
-#else
-       LASSERT(!sfw_data.fw_shuttingdown);
-       sfw_add_session_timer();
-#endif
 
        sfw_data.fw_active_srpc = NULL;
        spin_unlock(&sfw_data.fw_lock);
        return rc;
 }
 
-int
+static int
 sfw_bulk_ready(struct srpc_server_rpc *rpc, int status)
 {
        struct srpc_service     *sv = rpc->srpc_scd->scd_svc;
@@ -1419,13 +1391,8 @@ sfw_bulk_ready(struct srpc_server_rpc *rpc, int status)
 
        spin_lock(&sfw_data.fw_lock);
 
-#ifdef __KERNEL__
        if (!sfw_data.fw_shuttingdown)
                sfw_add_session_timer();
-#else
-       LASSERT(!sfw_data.fw_shuttingdown);
-       sfw_add_session_timer();
-#endif
 
        sfw_data.fw_active_srpc = NULL;
        spin_unlock(&sfw_data.fw_lock);
@@ -1642,7 +1609,7 @@ sfw_post_rpc (srpc_client_rpc_t *rpc)
        return;
 }
 
-static srpc_service_t sfw_services[] = 
+static srpc_service_t sfw_services[] =
 {
         {
                 /* sv_id */    SRPC_SERVICE_DEBUG,
@@ -1681,17 +1648,6 @@ static srpc_service_t sfw_services[] =
         }
 };
 
-extern sfw_test_client_ops_t ping_test_client;
-extern srpc_service_t        ping_test_service;
-extern void ping_init_test_client(void);
-extern void ping_init_test_service(void);
-
-extern sfw_test_client_ops_t brw_test_client;
-extern srpc_service_t        brw_test_service;
-extern void brw_init_test_client(void);
-extern void brw_init_test_service(void);
-
-
 int
 sfw_startup (void)
 {
@@ -1701,15 +1657,6 @@ sfw_startup (void)
         srpc_service_t  *sv;
         sfw_test_case_t *tsc;
 
-#ifndef __KERNEL__
-        char *s;
-
-        s = getenv("SESSION_TIMEOUT");
-        session_timeout = s != NULL ? atoi(s) : session_timeout;
-
-        s = getenv("RPC_TIMEOUT");
-        rpc_timeout = s != NULL ? atoi(s) : rpc_timeout;
-#endif
 
         if (session_timeout < 0) {
                 CERROR ("Session timeout must be non-negative: %d\n",
@@ -1809,12 +1756,8 @@ sfw_shutdown (void)
        spin_lock(&sfw_data.fw_lock);
 
         sfw_data.fw_shuttingdown = 1;
-#ifdef __KERNEL__
         lst_wait_until(sfw_data.fw_active_srpc == NULL, sfw_data.fw_lock,
                        "waiting for active RPC to finish.\n");
-#else
-        LASSERT (sfw_data.fw_active_srpc == NULL);
-#endif
 
         if (sfw_del_session_timer() != 0)
                 lst_wait_until(sfw_data.fw_session == NULL, sfw_data.fw_lock,