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 e4b184c..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
@@ -152,7 +151,6 @@ 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)
@@ -199,8 +197,14 @@ int lmv_revalidate_slaves(struct obd_export *exp,
                 * which is not needed here.
                 */
                memset(op_data, 0, sizeof(*op_data));
-               op_data->op_fid1 = *pfid;
+               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_tgt(lmv, lsm->lsm_md_oinfo[i].lmo_mds);
                if (!tgt)
@@ -342,8 +346,7 @@ retry:
                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);
@@ -353,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.
@@ -440,13 +442,38 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
        }
 
 retry:
-       if (op_data->op_name) {
+       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 if (fid_is_sane(&op_data->op_fid2)) {
-               tgt = lmv_fid2tgt(lmv, &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))
@@ -469,8 +496,7 @@ 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_fid2,
-                                                  op_data->op_mea2,
+                       rc = lmv_revalidate_slaves(exp, op_data->op_mea2,
                                                   cb_blocking,
                                                   extra_lock_flags);
                        if (rc != 0)