LU-6142 lustre: ptlrpc: don't use list_for_each_entry_safe unnecessarily.

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

diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c
index e5fae61..3cbc423 100644 (file)
--- a/lustre/ptlrpc/recover.c
+++ b/lustre/ptlrpc/recover.c
@@ -68,7 +68,7 @@ void ptlrpc_initiate_recovery(struct obd_import *imp)
 int ptlrpc_replay_next(struct obd_import *imp, int *inflight)
 {
        int rc = 0;
 int ptlrpc_replay_next(struct obd_import *imp, int *inflight)
 {
        int rc = 0;

-       struct ptlrpc_request *req = NULL, *pos;
+       struct ptlrpc_request *req = NULL;

        __u64 last_transno;
        ENTRY;
 
        __u64 last_transno;
        ENTRY;
 


@@ -123,8 +123,8 @@ int ptlrpc_replay_next(struct obd_import *imp, int *inflight)
        if (req == NULL) {
                struct ptlrpc_request *tmp;
 
        if (req == NULL) {
                struct ptlrpc_request *tmp;
 

-               list_for_each_entry_safe(tmp, pos, &imp->imp_replay_list,
-                                        rq_replay_list) {
+               list_for_each_entry(tmp, &imp->imp_replay_list,
+                                   rq_replay_list) {

                        if (tmp->rq_transno > last_transno) {
                                req = tmp;
                                break;
                        if (tmp->rq_transno > last_transno) {
                                req = tmp;
                                break;


@@ -173,7 +173,7 @@ int ptlrpc_replay_next(struct obd_import *imp, int *inflight)
  */
 int ptlrpc_resend(struct obd_import *imp)
 {
  */
 int ptlrpc_resend(struct obd_import *imp)
 {

-        struct ptlrpc_request *req, *next;
+       struct ptlrpc_request *req;

 
         ENTRY;
 
 
         ENTRY;
 


@@ -189,7 +189,7 @@ int ptlrpc_resend(struct obd_import *imp)
                 RETURN(-1);
         }
 
                 RETURN(-1);
         }
 

-       list_for_each_entry_safe(req, next, &imp->imp_sending_list, rq_list) {
+       list_for_each_entry(req, &imp->imp_sending_list, rq_list) {

                LASSERTF((long)req > PAGE_SIZE && req != LP_POISON,
                         "req %p bad\n", req);
                LASSERTF(req->rq_type != LI_POISON, "req %p freed\n", req);
                LASSERTF((long)req > PAGE_SIZE && req != LP_POISON,
                         "req %p bad\n", req);
                LASSERTF(req->rq_type != LI_POISON, "req %p freed\n", req);


@@ -212,10 +212,10 @@ int ptlrpc_resend(struct obd_import *imp)
  */
 void ptlrpc_wake_delayed(struct obd_import *imp)
 {
  */
 void ptlrpc_wake_delayed(struct obd_import *imp)
 {

-       struct ptlrpc_request *req, *pos;
+       struct ptlrpc_request *req;

 
        spin_lock(&imp->imp_lock);
 
        spin_lock(&imp->imp_lock);

-       list_for_each_entry_safe(req, pos, &imp->imp_delayed_list, rq_list) {
+       list_for_each_entry(req, &imp->imp_delayed_list, rq_list) {

                DEBUG_REQ(D_HA, req, "waking (set %p):", req->rq_set);
                ptlrpc_client_wake_req(req);
        }
                DEBUG_REQ(D_HA, req, "waking (set %p):", req->rq_set);
                ptlrpc_client_wake_req(req);
        }