LU-12624 lod: alloc dir stripes by QoS

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

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index 2ee7aa9..11a78b1 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));
 
@@ -106,7 +106,7 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
 
        op_data->op_bias = MDS_CROSS_REF;
        CDEBUG(D_INODE, "REMOTE_INTENT with fid="DFID" -> mds #%u\n",
-              PFID(&body->mbo_fid1), tgt->ltd_idx);
+              PFID(&body->mbo_fid1), tgt->ltd_index);
 
        /* ask for security context upon intent */
        if (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_OPEN) &&
@@ -201,12 +201,12 @@ int lmv_revalidate_slaves(struct obd_export *exp,
                op_data->op_fid1 = fid;
                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_idx);
+                      PFID(&fid), tgt->ltd_index);
 
                if (req != NULL) {
                        ptlrpc_req_finished(req);
@@ -305,22 +305,10 @@ static int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
                                /*
                                 * 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_migrate_existence_check(lmv, op_data);
                                if (rc != -ENOENT)
                                        RETURN(rc);
 
@@ -346,14 +334,15 @@ 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));
 
-               op_data->op_mds = tgt->ltd_idx;
+               op_data->op_mds = tgt->ltd_index;
        } else {
                LASSERT(fid_is_sane(&op_data->op_fid1));
-               LASSERT(fid_is_zero(&op_data->op_fid2));
+               LASSERT(it->it_flags & MDS_OPEN_PCC ||
+                       fid_is_zero(&op_data->op_fid2));
                LASSERT(op_data->op_name != NULL);
 
                tgt = lmv_locate_tgt(lmv, op_data);
@@ -363,7 +352,8 @@ retry:
 
        /* If it is ready to open the file by FID, do not need
         * allocate FID at all, otherwise it will confuse MDT */
-       if ((it->it_op & IT_CREAT) && !(it->it_flags & MDS_OPEN_BY_FID)) {
+       if ((it->it_op & IT_CREAT) && !(it->it_flags & MDS_OPEN_BY_FID ||
+                                       it->it_flags & MDS_OPEN_PCC)) {
                /*
                 * For lookup(IT_CREATE) cases allocate new fid and setup FLD
                 * for it.
@@ -375,7 +365,7 @@ retry:
 
        CDEBUG(D_INODE, "OPEN_INTENT with fid1="DFID", fid2="DFID","
               " name='%s' -> mds #%u\n", PFID(&op_data->op_fid1),
-              PFID(&op_data->op_fid2), op_data->op_name, tgt->ltd_idx);
+              PFID(&op_data->op_fid2), op_data->op_name, tgt->ltd_index);
 
        rc = md_intent_lock(tgt->ltd_exp, op_data, it, reqp, cb_blocking,
                            extra_lock_flags);
@@ -460,7 +450,7 @@ retry:
               ", name='%s' -> mds #%u\n",
               PFID(&op_data->op_fid1), PFID(&op_data->op_fid2),
               op_data->op_name ? op_data->op_name : "<NULL>",
-              tgt->ltd_idx);
+              tgt->ltd_index);
 
        op_data->op_bias &= ~MDS_CROSS_REF;