LU-930 misc: limit CDEBUG console message frequency

[fs/lustre-release.git] / lustre / ptlrpc / import.c

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index b7c07e2..26d7b98 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -278,11 +278,11 @@ static time64_t ptlrpc_inflight_deadline(struct ptlrpc_request *req,
 static time64_t ptlrpc_inflight_timeout(struct obd_import *imp)
 {
        time64_t now = ktime_get_real_seconds();
-       struct ptlrpc_request *req, *n;
+       struct ptlrpc_request *req;
        time64_t timeout = 0;
 
        spin_lock(&imp->imp_lock);
-       list_for_each_entry_safe(req, n, &imp->imp_sending_list, rq_list)
+       list_for_each_entry(req, &imp->imp_sending_list, rq_list)
                timeout = max(ptlrpc_inflight_deadline(req, now), timeout);
        spin_unlock(&imp->imp_lock);
        return timeout;
@@ -296,7 +296,7 @@ static time64_t ptlrpc_inflight_timeout(struct obd_import *imp)
  */
 void ptlrpc_invalidate_import(struct obd_import *imp)
 {
-       struct ptlrpc_request *req, *n;
+       struct ptlrpc_request *req;
        time64_t timeout;
        int rc;
 
@@ -372,15 +372,13 @@ void ptlrpc_invalidate_import(struct obd_import *imp)
                                 * this point. */
                                rc = 1;
                        } else {
-                               list_for_each_entry_safe(req, n,
-                                                        &imp->imp_sending_list,
-                                                        rq_list) {
+                               list_for_each_entry(req, &imp->imp_sending_list,
+                                                   rq_list) {
                                        DEBUG_REQ(D_ERROR, req,
                                                  "still on sending list");
                                }
-                               list_for_each_entry_safe(req, n,
-                                                        &imp->imp_delayed_list,
-                                                        rq_list) {
+                               list_for_each_entry(req, &imp->imp_delayed_list,
+                                                   rq_list) {
                                        DEBUG_REQ(D_ERROR, req,
                                                  "still on delayed list");
                                }
@@ -1215,7 +1213,7 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
                         * with server again
                         */
                        if ((MSG_CONNECT_RECOVERING & msg_flags)) {
-                               CDEBUG(level,
+                               CDEBUG_LIMIT(level,
                                       "%s@%s changed server handle from "
                                       "%#llx to %#llx"
                                       " but is still in recovery\n",