merge b_devel into b_setattr, in anticipation of merge

diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c
index 9514eb8..a1464a3 100644 (file)
--- a/lustre/ptlrpc/recover.c
+++ b/lustre/ptlrpc/recover.c
@@ -233,11 +233,6 @@ int ptlrpc_resend(struct obd_import *imp)
         ENTRY;
 
         spin_lock_irqsave(&imp->imp_lock, flags);
-        list_for_each(tmp, &imp->imp_sending_list) {
-                req = list_entry(tmp, struct ptlrpc_request, rq_list);
-                DEBUG_REQ(D_HA, req, "SENDING: ");
-        }
-
         list_for_each_safe(tmp, pos, &imp->imp_sending_list) {
                 req = list_entry(tmp, struct ptlrpc_request, rq_list);
 
@@ -246,12 +241,10 @@ int ptlrpc_resend(struct obd_import *imp)
                         break;
 
                     case RESTART:
-                        DEBUG_REQ(D_HA, req, "RESTART:");
                         ptlrpc_restart_req(req);
                         break;
 
                     case RESEND_IGNORE:
-                        DEBUG_REQ(D_HA, req, "RESEND_IGNORE:");
                         rc = ptlrpc_replay_req(req);
                         if (rc) {
                                 DEBUG_REQ(D_ERROR, req, "error %d resending:",
@@ -261,7 +254,6 @@ int ptlrpc_resend(struct obd_import *imp)
                         break;
 
                     case RESEND:
-                        DEBUG_REQ(D_HA, req, "RESEND:");
                         ptlrpc_resend_req(req);
                         break;