LU-13437 mdt: don't fetch LOOKUP lock for remote object

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

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index 92a2ff4..e4b184c 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -86,7 +86,7 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
 
        LASSERT(fid_is_sane(&body->mbo_fid1));
 
-       tgt = lmv_find_target(lmv, &body->mbo_fid1);
+       tgt = lmv_fid2tgt(lmv, &body->mbo_fid1);
        if (IS_ERR(tgt))
                GOTO(out, rc = PTR_ERR(tgt));
 
@@ -152,6 +152,7 @@ out:
 }
 
 int lmv_revalidate_slaves(struct obd_export *exp,
+                         const struct lu_fid *pfid,
                          const struct lmv_stripe_md *lsm,
                          ldlm_blocking_callback cb_blocking,
                          int extra_lock_flags)
@@ -198,12 +199,12 @@ int lmv_revalidate_slaves(struct obd_export *exp,
                 * which is not needed here.
                 */
                memset(op_data, 0, sizeof(*op_data));
-               op_data->op_fid1 = fid;
+               op_data->op_fid1 = *pfid;
                op_data->op_fid2 = fid;
 
-               tgt = lmv_get_target(lmv, lsm->lsm_md_oinfo[i].lmo_mds, NULL);
-               if (IS_ERR(tgt))
-                       GOTO(cleanup, rc = PTR_ERR(tgt));
+               tgt = lmv_tgt(lmv, lsm->lsm_md_oinfo[i].lmo_mds);
+               if (!tgt)
+                       GOTO(cleanup, rc = -ENODEV);
 
                CDEBUG(D_INODE, "Revalidate slave "DFID" -> mds #%u\n",
                       PFID(&fid), tgt->ltd_index);
@@ -300,31 +301,19 @@ static int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
                if (lmv_dir_bad_hash(op_data->op_mea1))
                        RETURN(-EBADF);
 
-               if (lmv_dir_migrating(op_data->op_mea1)) {
+               if (lmv_dir_layout_changing(op_data->op_mea1)) {
                        if (flags & O_EXCL) {
                                /*
                                 * open(O_CREAT | O_EXCL) needs to check
                                 * existing name, which should be done on both
-                                * old and new layout, to avoid creating new
-                                * file under old layout, check old layout on
+                                * old and new layout, check old layout on
                                 * client side.
                                 */
-                               tgt = lmv_locate_tgt(lmv, op_data);
-                               if (IS_ERR(tgt))
-                                       RETURN(PTR_ERR(tgt));
-
-                               rc = md_getattr_name(tgt->ltd_exp, op_data,
-                                                    reqp);
-                               if (!rc) {
-                                       ptlrpc_req_finished(*reqp);
-                                       *reqp = NULL;
-                                       RETURN(-EEXIST);
-                               }
-
+                               rc = lmv_old_layout_lookup(lmv, op_data);
                                if (rc != -ENOENT)
                                        RETURN(rc);
 
-                               op_data->op_post_migrate = true;
+                               op_data->op_new_layout = true;
                        } else {
                                /*
                                 * open(O_CREAT) will be sent to MDT in old
@@ -346,7 +335,7 @@ retry:
                if (lmv_dir_striped(op_data->op_mea1))
                        op_data->op_fid1 = op_data->op_fid2;
 
-               tgt = lmv_find_target(lmv, &op_data->op_fid2);
+               tgt = lmv_fid2tgt(lmv, &op_data->op_fid2);
                if (IS_ERR(tgt))
                        RETURN(PTR_ERR(tgt));
 
@@ -451,13 +440,18 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
        }
 
 retry:
-       tgt = lmv_locate_tgt(lmv, op_data);
+       if (op_data->op_name) {
+               tgt = lmv_locate_tgt(lmv, op_data);
+               if (!fid_is_sane(&op_data->op_fid2))
+                       fid_zero(&op_data->op_fid2);
+       } else if (fid_is_sane(&op_data->op_fid2)) {
+               tgt = lmv_fid2tgt(lmv, &op_data->op_fid2);
+       } else {
+               tgt = lmv_fid2tgt(lmv, &op_data->op_fid1);
+       }
        if (IS_ERR(tgt))
                RETURN(PTR_ERR(tgt));
 
-       if (!fid_is_sane(&op_data->op_fid2))
-               fid_zero(&op_data->op_fid2);
-
        CDEBUG(D_INODE, "LOOKUP_INTENT with fid1="DFID", fid2="DFID
               ", name='%s' -> mds #%u\n",
               PFID(&op_data->op_fid1), PFID(&op_data->op_fid2),
@@ -475,7 +469,8 @@ retry:
                /* If RPC happens, lsm information will be revalidated
                 * during update_inode process (see ll_update_lsm_md) */
                if (lmv_dir_striped(op_data->op_mea2)) {
-                       rc = lmv_revalidate_slaves(exp, op_data->op_mea2,
+                       rc = lmv_revalidate_slaves(exp, &op_data->op_fid2,
+                                                  op_data->op_mea2,
                                                   cb_blocking,
                                                   extra_lock_flags);
                        if (rc != 0)