LU-13783 procfs: fix improper prop_ops fields

[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..e9ae2c5 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #define DEBUG_SUBSYSTEM S_LMV
@@ -86,7 +85,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));
 
@@ -200,10 +199,16 @@ int lmv_revalidate_slaves(struct obd_export *exp,
                memset(op_data, 0, sizeof(*op_data));
                op_data->op_fid1 = fid;
                op_data->op_fid2 = fid;
+               /* shard revalidate only needs to fetch attributes and UPDATE
+                * lock, which is similar to the bottom half of remote object
+                * getattr, set this flag so that MDT skips checking whether
+                * it's remote object.
+                */
+               op_data->op_bias = MDS_CROSS_REF;
 
-               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 +305,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,15 +339,14 @@ 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_index;
        } else {
                LASSERT(fid_is_sane(&op_data->op_fid1));
-               LASSERT(it->it_flags & MDS_OPEN_PCC ||
-                       fid_is_zero(&op_data->op_fid2));
+               LASSERT(fid_is_zero(&op_data->op_fid2));
                LASSERT(op_data->op_name != NULL);
 
                tgt = lmv_locate_tgt(lmv, op_data);
@@ -364,8 +356,7 @@ 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 ||
-                                       it->it_flags & MDS_OPEN_PCC)) {
+       if ((it->it_op & IT_CREAT) && !(it->it_flags & MDS_OPEN_BY_FID)) {
                /*
                 * For lookup(IT_CREATE) cases allocate new fid and setup FLD
                 * for it.
@@ -451,13 +442,43 @@ 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_flags & MF_GETATTR_BY_FID) {
+               /* getattr by FID, replace fid1 with stripe FID,
+                * NB, don't replace if name is "/", because it may be a subtree
+                * mount, and if it's a striped directory, fid1 will be replaced
+                * to stripe FID by hash, while fid2 is master object FID, which
+                * will be treated as a remote object if the two FIDs are
+                * located on different MDTs, and LOOKUP lock can't be fetched.
+                */
+               LASSERT(op_data->op_name);
+               if (op_data->op_namelen != 1 ||
+                   strncmp(op_data->op_name, "/", 1) != 0) {
+                       tgt = lmv_locate_tgt(lmv, op_data);
+                       if (IS_ERR(tgt))
+                               RETURN(PTR_ERR(tgt));
+               }
+
+               /* name is used to locate stripe target, clear it here
+                * to avoid packing name in request, so that MDS knows
+                * it's getattr by FID.
+                */
+               op_data->op_name = NULL;
+               op_data->op_namelen = 0;
+
+               /* getattr request is sent to MDT where fid2 inode is */
+               tgt = lmv_fid2tgt(lmv, &op_data->op_fid2);
+       } else if (op_data->op_name) {
+               /* getattr by name */
+               tgt = lmv_locate_tgt(lmv, op_data);
+               if (!fid_is_sane(&op_data->op_fid2))
+                       fid_zero(&op_data->op_fid2);
+       } else {
+               /* old way to getattr by FID, parent FID not packed */
+               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),