LU-5275 gnilnd: Add definition for PDE_DATA

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

diff --git a/lnet/selftest/brw_test.c b/lnet/selftest/brw_test.c
index 3dee7d1..7e8428b 100644 (file)
--- a/lnet/selftest/brw_test.c
+++ b/lnet/selftest/brw_test.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -65,7 +65,7 @@ brw_client_fini (sfw_test_instance_t *tsi)
        }
 }
 
-int
+static int
 brw_client_init (sfw_test_instance_t *tsi)
 {
        sfw_session_t    *sn = tsi->tsi_batch->bat_session;
@@ -130,25 +130,21 @@ brw_client_init (sfw_test_instance_t *tsi)
 #define BRW_MAGIC       0xeeb0eeb1eeb2eeb3ULL
 #define BRW_MSIZE       sizeof(__u64)
 
-int brw_inject_one_error (void)
+static int brw_inject_one_error(void)
 {
        struct timeval tv;
 
        if (brw_inject_errors <= 0) return 0;
 
-#ifndef __KERNEL__
-       gettimeofday(&tv, NULL);
-#else
        do_gettimeofday(&tv);
-#endif
 
        if ((tv.tv_usec & 1) == 0) return 0;
 
        return brw_inject_errors--;
 }
 
-void
-brw_fill_page (struct page *pg, int pattern, __u64 magic)
+static void
+brw_fill_page(struct page *pg, int pattern, __u64 magic)
 {
        char *addr = page_address(pg);
         int   i;
@@ -177,8 +173,8 @@ brw_fill_page (struct page *pg, int pattern, __u64 magic)
         return;
 }
 
-int
-brw_check_page (struct page *pg, int pattern, __u64 magic)
+static int
+brw_check_page(struct page *pg, int pattern, __u64 magic)
 {
        char  *addr = page_address(pg);
         __u64  data = 0; /* make compiler happy */
@@ -217,36 +213,26 @@ bad_data:
         return 1;
 }
 
-void
-brw_fill_bulk (srpc_bulk_t *bk, int pattern, __u64 magic)
+static void
+brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
 {
         int         i;
        struct page *pg;
 
         for (i = 0; i < bk->bk_niov; i++) {
-#ifdef __KERNEL__
                 pg = bk->bk_iovs[i].kiov_page;
-#else
-                LASSERT (bk->bk_pages != NULL);
-                pg = bk->bk_pages[i];
-#endif
                 brw_fill_page(pg, pattern, magic);
         }
 }
 
-int
-brw_check_bulk (srpc_bulk_t *bk, int pattern, __u64 magic)
+static int
+brw_check_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
 {
         int         i;
        struct page *pg;
 
         for (i = 0; i < bk->bk_niov; i++) {
-#ifdef __KERNEL__
                 pg = bk->bk_iovs[i].kiov_page;
-#else
-                LASSERT (bk->bk_pages != NULL);
-                pg = bk->bk_pages[i];
-#endif
                 if (brw_check_page(pg, pattern, magic) != 0) {
                         CERROR ("Bulk page %p (%d/%d) is corrupted!\n",
                                 pg, i, bk->bk_niov);
@@ -360,14 +346,11 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
         }
 
 out:
-#ifndef __KERNEL__
-        rpc->crpc_bulk.bk_pages = NULL;
-#endif
         return;
 }
 
-void
-brw_server_rpc_done (srpc_server_rpc_t *rpc)
+static void
+brw_server_rpc_done(srpc_server_rpc_t *rpc)
 {
         srpc_bulk_t *blk = rpc->srpc_bulk;
 
@@ -385,8 +368,8 @@ brw_server_rpc_done (srpc_server_rpc_t *rpc)
         sfw_free_pages(rpc);
 }
 
-int
-brw_bulk_ready (srpc_server_rpc_t *rpc, int status)
+static int
+brw_bulk_ready(srpc_server_rpc_t *rpc, int status)
 {
         __u64             magic = BRW_MAGIC;
         srpc_brw_reply_t *reply = &rpc->srpc_replymsg.msg_body.brw_reply;
@@ -421,7 +404,7 @@ brw_bulk_ready (srpc_server_rpc_t *rpc, int status)
         return 0;
 }
 
-int
+static int
 brw_server_handle(struct srpc_server_rpc *rpc)
 {
        struct srpc_service     *sv = rpc->srpc_scd->scd_svc;
@@ -507,12 +490,6 @@ void brw_init_test_client(void)
 srpc_service_t brw_test_service;
 void brw_init_test_service(void)
 {
-#ifndef __KERNEL__
-       char *s;
-
-       s = getenv("BRW_INJECT_ERRORS");
-       brw_inject_errors = s != NULL ? atoi(s) : brw_inject_errors;
-#endif
 
         brw_test_service.sv_id         = SRPC_SERVICE_BRW;
         brw_test_service.sv_name       = "brw_test";