- made many CERRORs (the informative, rather than bad ones) into CDEBUGs. It

  should run silently now.

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index d575f8d..7735582 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -840,8 +840,7 @@ static void __exit cleanup_obdclass(void)
 
         obd_cleanup_obdo_cache();
         obd_sysctl_clean();
-        if (obd_memory)
-                CERROR("obd memory leaked: %ld bytes\n", obd_memory);
+        CERROR("obd memory leaked: %ld bytes\n", obd_memory);
         obd_init_magic = 0;
         EXIT;
 }

diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 12dbb15..2bc30c0 100644 (file)
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -217,9 +217,9 @@ int ptlrpc_queue_wait(struct ptlrpc_client *cl, struct ptlrpc_request *req)
                return -rc;
        }
 
-        CDEBUG(0, "-- sleeping\n");
+        CDEBUG(D_OTHER, "-- sleeping\n");
         wait_event_interruptible(req->rq_wait_for_rep, ptlrpc_check_reply(req));
-        CDEBUG(0, "-- done\n");
+        CDEBUG(D_OTHER, "-- done\n");
         
         if (req->rq_flags == PTL_RPC_INTR) { 
                 /* Clean up the dangling reply buffers */
@@ -240,7 +240,7 @@ int ptlrpc_queue_wait(struct ptlrpc_client *cl, struct ptlrpc_request *req)
                CERROR("unpack_rep failed: %d\n", rc);
                return rc;
        }
-        CERROR("got rep %d\n", req->rq_rephdr->xid);
+        CDEBUG(D_NET, "got rep %d\n", req->rq_rephdr->xid);
 
        if ( req->rq_rephdr->status == 0 )
                 CDEBUG(0, "--> buf %p len %d status %d\n", req->rq_repbuf,

diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c
index 9b1a181..15ab612 100644 (file)
--- a/lustre/ptlrpc/niobuf.c
+++ b/lustre/ptlrpc/niobuf.c
@@ -50,7 +50,7 @@ int ptlrpc_check_bulk_sent(struct ptlrpc_bulk_desc *bulk)
                 return 1;
         }
 
-        CERROR("no event yet\n");
+        CDEBUG(D_NET, "no event yet\n");
         return 0;
 }
 
@@ -102,7 +102,7 @@ int ptl_send_buf(struct ptlrpc_request *request, struct lustre_peer *peer,
         remote_id.nid = peer->peer_nid;
         remote_id.pid = 0;
 
-        CERROR("Sending %d bytes to portal %d, xid %d\n",
+        CDEBUG(D_NET, "Sending %d bytes to portal %d, xid %d\n",
                request->rq_req_md.length, portal, request->rq_xid);
 
         rc = PtlPut(md_h, ack, remote_id, portal, 0, request->rq_xid, 0, 0);
@@ -140,7 +140,7 @@ int ptlrpc_send_bulk(struct ptlrpc_bulk_desc *bulk, int portal)
         remote_id.nid = bulk->b_peer.peer_nid;
         remote_id.pid = 0;
 
-        CERROR("Sending %d bytes to portal %d, xid %d\n",
+        CDEBUG(D_NET, "Sending %d bytes to portal %d, xid %d\n",
                bulk->b_md.length, portal, bulk->b_xid);
 
         rc = PtlPut(md_h, PTL_ACK_REQ, remote_id, portal, 0, bulk->b_xid, 0, 0);
@@ -349,7 +349,7 @@ int ptl_received_rpc(struct ptlrpc_service *service) {
                 rc = PtlMEInsert(service->srv_me_h[service->srv_me_tail],
                                  service->srv_id, 0, ~0, PTL_RETAIN,
                                  PTL_INS_AFTER, &(service->srv_me_h[index]));
-                CERROR("Inserting new ME and MD in ring, rc %d\n", rc);
+                CDEBUG(D_NET, "Inserting new ME and MD in ring, rc %d\n", rc);
                 service->srv_me_tail = index;
                 service->srv_ref_count[index] = 0;
                 

diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 82507e9..306f781 100644 (file)
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -63,7 +63,7 @@ static int ptlrpc_check_event(struct ptlrpc_service *svc)
                         CERROR("dropped event!\n");
                         BUG();
                 }
-                CERROR("PtlEQGet returns %d\n", rc); 
+                CDEBUG(D_NET, "PtlEQGet returns %d\n", rc); 
                 EXIT;
                 return 0;
         }
@@ -168,7 +168,7 @@ static int ptlrpc_main(void *arg)
                         request.rq_reqbuf = svc->srv_ev.mem_desc.start + svc->srv_ev.offset;
                         request.rq_reqlen = svc->srv_ev.mem_desc.length;
                         request.rq_xid = svc->srv_ev.match_bits;
-                        CERROR("got req %d\n", request.rq_xid);
+                        CDEBUG(D_NET, "got req %d\n", request.rq_xid);
 
                         request.rq_peer.peer_nid = svc->srv_ev.initiator.nid;
                         /* FIXME: this NI should be the incoming NI.
@@ -199,7 +199,7 @@ static int ptlrpc_main(void *arg)
         svc->srv_thread = NULL;
         svc->srv_flags = SVC_STOPPED;
         wake_up(&svc->srv_ctl_waitq);
-        CERROR("svc exiting process %d\n", current->pid);
+        CDEBUG(D_NET, "svc exiting process %d\n", current->pid);
         return 0;
 }