LU-7669 lmv: assume a real connection in lmv_connect()

[fs/lustre-release.git] / lustre / lmv / lmv_intent.c

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index 566f191..7ae1600 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -92,7 +92,7 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
        if (pmode) {
                plock.cookie = it->it_lock_handle;
                it->it_lock_mode = 0;
-               it->it_data = NULL;
+               it->it_request = NULL;
        }
 
        LASSERT(fid_is_sane(&body->mbo_fid1));
@@ -242,7 +242,7 @@ int lmv_revalidate_slaves(struct obd_export *exp,
                        LTIME_S(inode->i_mtime) = body->mbo_mtime;
                }
 
-               md_set_lock_data(tgt->ltd_exp, &lockh->cookie, inode, NULL);
+               md_set_lock_data(tgt->ltd_exp, lockh, inode, NULL);
                if (it.it_lock_mode != 0 && lockh != NULL) {
                        ldlm_lock_decref(lockh, it.it_lock_mode);
                        it.it_lock_mode = 0;
@@ -424,7 +424,7 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
 
                        /* release the previous request */
                        ptlrpc_req_finished(*reqp);
-                       it->it_data = NULL;
+                       it->it_request = NULL;
                        *reqp = NULL;
 
                        oinfo = &lsm->lsm_md_oinfo[stripe_index];
@@ -471,8 +471,7 @@ int lmv_intent_lock(struct obd_export *exp, struct md_op_data *op_data,
                    ldlm_blocking_callback cb_blocking,
                    __u64 extra_lock_flags)
 {
-       struct obd_device *obd = exp->exp_obd;
-       int                rc;
+       int rc;
        ENTRY;
 
        LASSERT(it != NULL);
@@ -483,10 +482,6 @@ int lmv_intent_lock(struct obd_export *exp, struct md_op_data *op_data,
                (int)op_data->op_namelen, op_data->op_name,
                PFID(&op_data->op_fid1));
 
-       rc = lmv_check_connect(obd);
-       if (rc)
-               RETURN(rc);
-
        if (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_LAYOUT))
                rc = lmv_intent_lookup(exp, op_data, it, reqp, cb_blocking,
                                       extra_lock_flags);