LU-8054 lfsck: enhance lfsck notify API

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

diff --git a/lnet/selftest/ping_test.c b/lnet/selftest/ping_test.c
index 0dd1ba2..ea20761 100644 (file)
--- a/lnet/selftest/ping_test.c
+++ b/lnet/selftest/ping_test.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -45,7 +41,8 @@
 #define LST_PING_TEST_MAGIC     0xbabeface
 
 static int ping_srv_workitems = SFW_TEST_WI_MAX;
-CFS_MODULE_PARM(ping_srv_workitems, "i", int, 0644, "# PING server workitems");
+module_param(ping_srv_workitems, int, 0644);
+MODULE_PARM_DESC(ping_srv_workitems, "# PING server workitems");
 
 typedef struct {
        spinlock_t      pnd_lock;       /* serialize */
@@ -86,7 +83,7 @@ ping_client_fini (sfw_test_instance_t *tsi)
 
 static int
 ping_client_prep_rpc(sfw_test_unit_t *tsu,
-                    lnet_process_id_t dest, srpc_client_rpc_t **rpc)
+                    struct lnet_process_id dest, srpc_client_rpc_t **rpc)
 {
        srpc_ping_reqst_t   *req;
        sfw_test_instance_t *tsi = tsu->tsu_instance;
@@ -111,7 +108,7 @@ ping_client_prep_rpc(sfw_test_unit_t *tsu,
 
        ktime_get_real_ts64(&ts);
        req->pnr_time_sec  = ts.tv_sec;
-       req->pnr_time_usec = ts.tv_nsec / NSEC_PER_USEC;
+       req->pnr_time_nsec = ts.tv_nsec;
 
        return rc;
 }
@@ -161,9 +158,9 @@ ping_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
         }
 
        ktime_get_real_ts64(&ts);
-        CDEBUG (D_NET, "%d reply in %u usec\n", reply->pnr_seq,
-               (unsigned)((ts.tv_sec - reqst->pnr_time_sec) * 1000000 +
-                          (ts.tv_nsec / NSEC_PER_USEC - reqst->pnr_time_usec)));
+       CDEBUG(D_NET, "%d reply in %llu nsec\n", reply->pnr_seq,
+              (u64)((ts.tv_sec - reqst->pnr_time_sec) * NSEC_PER_SEC +
+                   (ts.tv_nsec - reqst->pnr_time_nsec)));
         return;
 }
 
@@ -184,7 +181,7 @@ ping_server_handle(struct srpc_server_rpc *rpc)
                 __swab32s(&req->pnr_seq);
                 __swab32s(&req->pnr_magic);
                 __swab64s(&req->pnr_time_sec);
-                __swab64s(&req->pnr_time_usec);
+               __swab64s(&req->pnr_time_nsec);
         }
         LASSERT (reqstmsg->msg_type == srpc_service2request(sv->sv_id));