- changes about @flags in m_disconnect(). It should be cohenernt with m_connect(),

[fs/lustre-release.git] / lustre / ldlm / ldlm_lib.c

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 73e3ece..20a398e 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -417,7 +417,7 @@ out_sem:
         return rc;
 }
 
-int client_disconnect_export(struct obd_export *exp, int flags)
+int client_disconnect_export(struct obd_export *exp, unsigned long flags)
 {
         struct obd_device *obd = class_exp2obd(exp);
         struct client_obd *cli = &obd->u.cli;
@@ -727,7 +727,7 @@ int target_handle_connect(struct ptlrpc_request *req)
         revimp->imp_state = LUSTRE_IMP_FULL;
         class_import_put(revimp);
 
-        rc = obd_connect_post(export);
+        rc = obd_connect_post(export, connect_flags);
 out:
         if (rc)
                 req->rq_status = rc;
@@ -1177,7 +1177,6 @@ int target_queue_recovery_request(struct ptlrpc_request *req,
         if (obd->obd_recovery_data.trd_processing_task == current->pid ||
             transno < obd->obd_next_recovery_transno) {
                 /* Processing the queue right now, don't re-add. */
-                lustre_msg_clear_flags(req->rq_reqmsg, MSG_RESENT);
                 LASSERT(list_empty(&req->rq_list));
                 spin_unlock_bh(&obd->obd_processing_task_lock);
                 return 1;