LU-6068 misc: update Intel copyright messages 2014

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

diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c
index a2573b2..d3f7e98 100644 (file)
--- a/lnet/selftest/rpc.c
+++ b/lnet/selftest/rpc.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, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -503,6 +503,7 @@ srpc_post_passive_rqtbuf(int service, int local, void *buf, int len,
 
 int
 srpc_service_post_buffer(struct srpc_service_cd *scd, struct srpc_buffer *buf)
+__must_hold(&scd->scd_lock)
 {
        struct srpc_service     *sv = scd->scd_svc;
        struct srpc_msg         *msg = &buf->buf_msg;
@@ -700,8 +701,8 @@ srpc_finish_service(struct srpc_service *sv)
                }
 
                if (scd->scd_buf_nposted > 0) {
-                       CDEBUG(D_NET, "waiting for %d posted buffers to unlink",
-                              scd->scd_buf_nposted);
+                       CDEBUG(D_NET, "waiting for %d posted buffers to "
+                              "unlink\n", scd->scd_buf_nposted);
                        spin_unlock(&scd->scd_lock);
                        return 0;
                }
@@ -734,6 +735,7 @@ srpc_finish_service(struct srpc_service *sv)
 /* called with sv->sv_lock held */
 void
 srpc_service_recycle_buffer(struct srpc_service_cd *scd, srpc_buffer_t *buf)
+__must_hold(&scd->scd_lock)
 {
        if (!scd->scd_svc->sv_shuttingdown && scd->scd_buf_adjust >= 0) {
                if (srpc_service_post_buffer(scd, buf) != 0) {
@@ -1458,6 +1460,14 @@ srpc_lnet_ev_handler(lnet_event_t *ev)
        if (ev->status != 0) {
                spin_lock(&srpc_data.rpc_glock);
                srpc_data.rpc_counters.errors++;
+               CERROR("ev->status = %d, ev->type = %d, errors = %u, "
+                      "rpcs_sent = %u, rpcs_rcvd = %u, rpcs_dropped = %u, "
+                      "rpcs_expired = %u\n",
+                      ev->status, ev->type, srpc_data.rpc_counters.errors,
+                      srpc_data.rpc_counters.rpcs_sent,
+                      srpc_data.rpc_counters.rpcs_rcvd,
+                      srpc_data.rpc_counters.rpcs_dropped,
+                      srpc_data.rpc_counters.rpcs_expired);
                spin_unlock(&srpc_data.rpc_glock);
        }
 
@@ -1665,10 +1675,10 @@ srpc_startup (void)
         srpc_data.rpc_state = SRPC_STATE_NONE;
 
 #ifdef __KERNEL__
-        rc = LNetNIInit(LUSTRE_SRV_LNET_PID);
+       rc = LNetNIInit(LNET_PID_LUSTRE);
 #else
         if (the_lnet.ln_server_mode_flag)
-                rc = LNetNIInit(LUSTRE_SRV_LNET_PID);
+               rc = LNetNIInit(LNET_PID_LUSTRE);
         else
                 rc = LNetNIInit(getpid() | LNET_PID_USERFLAG);
 #endif