LU-6245 libcfs: remove libcfsutil.h

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

diff --git a/lnet/selftest/ping_test.c b/lnet/selftest/ping_test.c
index 8a1ddd3..18dcf5a 100644 (file)
--- a/lnet/selftest/ping_test.c
+++ b/lnet/selftest/ping_test.c
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,12 +44,12 @@
 
 #define LST_PING_TEST_MAGIC     0xbabeface
 
-int ping_srv_workitems = SFW_TEST_WI_MAX;
+static int ping_srv_workitems = SFW_TEST_WI_MAX;
 CFS_MODULE_PARM(ping_srv_workitems, "i", int, 0644, "# PING server workitems");
 
 typedef struct {
-        cfs_spinlock_t  pnd_lock;       /* serialize */
-        int             pnd_counter;    /* sequence counter */
+       spinlock_t      pnd_lock;       /* serialize */
+       int             pnd_counter;    /* sequence counter */
 } lst_ping_data_t;
 
 static lst_ping_data_t  lst_ping_data;
@@ -60,10 +62,10 @@ ping_client_init(sfw_test_instance_t *tsi)
        LASSERT(tsi->tsi_is_client);
        LASSERT(sn != NULL && (sn->sn_features & ~LST_FEATS_MASK) == 0);
 
-        cfs_spin_lock_init(&lst_ping_data.pnd_lock);
-        lst_ping_data.pnd_counter = 0;
+       spin_lock_init(&lst_ping_data.pnd_lock);
+       lst_ping_data.pnd_counter = 0;
 
-        return 0;
+       return 0;
 }
 
 static void
@@ -75,7 +77,7 @@ ping_client_fini (sfw_test_instance_t *tsi)
         LASSERT (sn != NULL);
         LASSERT (tsi->tsi_is_client);
 
-        errors = cfs_atomic_read(&sn->sn_ping_errors);
+       errors = atomic_read(&sn->sn_ping_errors);
         if (errors)
                 CWARN ("%d pings have failed.\n", errors);
         else
@@ -103,15 +105,15 @@ ping_client_prep_rpc(sfw_test_unit_t *tsu,
 
         req->pnr_magic = LST_PING_TEST_MAGIC;
 
-        cfs_spin_lock(&lst_ping_data.pnd_lock);
-        req->pnr_seq = lst_ping_data.pnd_counter ++;
-        cfs_spin_unlock(&lst_ping_data.pnd_lock);
+       spin_lock(&lst_ping_data.pnd_lock);
+       req->pnr_seq = lst_ping_data.pnd_counter++;
+       spin_unlock(&lst_ping_data.pnd_lock);
 
-        cfs_fs_timeval(&tv);
-        req->pnr_time_sec  = tv.tv_sec;
-        req->pnr_time_usec = tv.tv_usec;
+       cfs_fs_timeval(&tv);
+       req->pnr_time_sec  = tv.tv_sec;
+       req->pnr_time_usec = tv.tv_usec;
 
-        return rc;
+       return rc;
 }
 
 static void
@@ -127,7 +129,7 @@ ping_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
 
         if (rpc->crpc_status != 0) {
                 if (!tsi->tsi_stopping) /* rpc could have been aborted */
-                        cfs_atomic_inc(&sn->sn_ping_errors);
+                       atomic_inc(&sn->sn_ping_errors);
                 CERROR ("Unable to ping %s (%d): %d\n",
                         libcfs_id2str(rpc->crpc_dest),
                         reqst->pnr_seq, rpc->crpc_status);
@@ -142,7 +144,7 @@ ping_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
 
         if (reply->pnr_magic != LST_PING_TEST_MAGIC) {
                 rpc->crpc_status = -EBADMSG;
-                cfs_atomic_inc(&sn->sn_ping_errors);
+               atomic_inc(&sn->sn_ping_errors);
                 CERROR ("Bad magic %u from %s, %u expected.\n",
                         reply->pnr_magic, libcfs_id2str(rpc->crpc_dest),
                         LST_PING_TEST_MAGIC);
@@ -151,7 +153,7 @@ ping_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
 
         if (reply->pnr_seq != reqst->pnr_seq) {
                 rpc->crpc_status = -EBADMSG;
-                cfs_atomic_inc(&sn->sn_ping_errors);
+               atomic_inc(&sn->sn_ping_errors);
                 CERROR ("Bad seq %u from %s, %u expected.\n",
                         reply->pnr_seq, libcfs_id2str(rpc->crpc_dest),
                         reqst->pnr_seq);