LU-13004 ptlrpc: Allow BULK_BUF_KIOV to accept a kvec

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

diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c
index c923ab9..d2da4a4 100644 (file)
--- a/lustre/ptlrpc/recover.c
+++ b/lustre/ptlrpc/recover.c
@@ -145,7 +145,7 @@ int ptlrpc_replay_next(struct obd_import *imp, int *inflight)
         * exception is that resend replay could have been removed from the
         * unreplied list. */
        if (req != NULL && list_empty(&req->rq_unreplied_list)) {
-               DEBUG_REQ(D_HA, req, "resend_replay: %d, last_transno: %llu\n",
+               DEBUG_REQ(D_HA, req, "resend_replay=%d, last_transno=%llu",
                          imp->imp_resend_replay, last_transno);
                ptlrpc_add_unreplied(req);
                imp->imp_known_replied_xid = ptlrpc_known_replied_xid(imp);
@@ -328,39 +328,42 @@ int ptlrpc_recover_import(struct obd_import *imp, char *new_uuid, int async)
                        GOTO(out, rc);
        }
 
-        /* Check if reconnect is already in progress */
+       /* Check if reconnect is already in progress */
        spin_lock(&imp->imp_lock);
        if (imp->imp_state != LUSTRE_IMP_DISCON) {
                imp->imp_force_verify = 1;
                rc = -EALREADY;
        }
        spin_unlock(&imp->imp_lock);
-        if (rc)
-                GOTO(out, rc);
+       if (rc)
+               GOTO(out, rc);
 
        OBD_RACE(OBD_FAIL_PTLRPC_CONNECT_RACE);
 
-        rc = ptlrpc_connect_import(imp);
-        if (rc)
-                GOTO(out, rc);
-
-        if (!async) {
-                struct l_wait_info lwi;
-               long secs = cfs_time_seconds(obd_timeout);
-
-               CDEBUG(D_HA, "%s: recovery started, waiting %lu seconds\n",
-                       obd2cli_tgt(imp->imp_obd), secs);
+       rc = ptlrpc_connect_import(imp);
+       if (rc)
+               GOTO(out, rc);
 
-                lwi = LWI_TIMEOUT(secs, NULL, NULL);
-                rc = l_wait_event(imp->imp_recovery_waitq,
-                                  !ptlrpc_import_in_recovery(imp), &lwi);
-                CDEBUG(D_HA, "%s: recovery finished\n",
-                       obd2cli_tgt(imp->imp_obd));
-        }
-        EXIT;
+       if (!async) {
+               long timeout = cfs_time_seconds(obd_timeout);
+
+               CDEBUG(D_HA, "%s: recovery started, waiting %u jiffies\n",
+                      obd2cli_tgt(imp->imp_obd), obd_timeout);
+
+               rc = wait_event_idle_timeout(imp->imp_recovery_waitq,
+                                            !ptlrpc_import_in_recovery(imp),
+                                            timeout);
+               if (rc == 0)
+                       rc = -ETIMEDOUT;
+               else
+                       rc = 0;
+               CDEBUG(D_HA, "%s: recovery finished\n",
+                      obd2cli_tgt(imp->imp_obd));
+       }
+       EXIT;
 
 out:
-        return rc;
+       return rc;
 }
 EXPORT_SYMBOL(ptlrpc_recover_import);