LU-6475 mdt: race between open and migrate

[fs/lustre-release.git] / lustre / osp / osp_trans.c

diff --git a/lustre/osp/osp_trans.c b/lustre/osp/osp_trans.c
index df648fc..e700acf 100644 (file)
--- a/lustre/osp/osp_trans.c
+++ b/lustre/osp/osp_trans.c
@@ -982,9 +982,11 @@ static int osp_send_update_req(const struct lu_env *env,
                if (top_device->ld_obd->obd_recovering)
                        req->rq_allow_replay = 1;
 
-               osp_get_rpc_lock(osp);
+               if (osp->opd_connect_mdt)
+                       osp_get_rpc_lock(osp);
                rc = ptlrpc_queue_wait(req);
-               osp_put_rpc_lock(osp);
+               if (osp->opd_connect_mdt)
+                       osp_put_rpc_lock(osp);
                if ((rc == -ENOMEM && req->rq_set == NULL) ||
                    (req->rq_transno == 0 && !req->rq_committed)) {
                        if (args->oaua_update != NULL) {
@@ -1321,6 +1323,7 @@ int osp_trans_stop(const struct lu_env *env, struct dt_device *dt,
        }
 
        if (!osp->opd_connect_mdt) {
+               osp_trans_callback(env, oth, th->th_result);
                rc = osp_send_update_req(env, osp, oth->ot_our);
                GOTO(out, rc);
        }