ORNL-28: Solve reconnecting race between IR and SR

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

diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 4047407..ab65cb0 100644 (file)
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -471,7 +471,7 @@ int client_connect_import(const struct lu_env *env,
                 imp->imp_connect_flags_orig = data->ocd_connect_flags;
         }
 
                 imp->imp_connect_flags_orig = data->ocd_connect_flags;
         }
 

-        rc = ptlrpc_connect_import(imp, NULL);
+        rc = ptlrpc_connect_import(imp);

         if (rc != 0) {
                 LASSERT (imp->imp_state == LUSTRE_IMP_DISCON);
                 GOTO(out_ldlm, rc);
         if (rc != 0) {
                 LASSERT (imp->imp_state == LUSTRE_IMP_DISCON);
                 GOTO(out_ldlm, rc);