LU-10092 First phase of persistent client cache project merging

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

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index 50ac0de..92a2ff4 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -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) &&
@@ -206,7 +206,7 @@ int lmv_revalidate_slaves(struct obd_export *exp,
                        GOTO(cleanup, rc = PTR_ERR(tgt));
 
                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);
@@ -292,16 +292,15 @@ static int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
        ENTRY;
 
        /* do not allow file creation in foreign dir */
-       if ((it->it_op & IT_CREAT) && op_data->op_mea1 != NULL &&
-           op_data->op_mea1->lsm_md_magic == LMV_MAGIC_FOREIGN)
+       if ((it->it_op & IT_CREAT) && lmv_dir_foreign(op_data->op_mea1))
                RETURN(-ENODATA);
 
        if ((it->it_op & IT_CREAT) && !(flags & MDS_OPEN_BY_FID)) {
                /* don't allow create under dir with bad hash */
-               if (lmv_is_dir_bad_hash(op_data->op_mea1))
+               if (lmv_dir_bad_hash(op_data->op_mea1))
                        RETURN(-EBADF);
 
-               if (lmv_is_dir_migrating(op_data->op_mea1)) {
+               if (lmv_dir_migrating(op_data->op_mea1)) {
                        if (flags & O_EXCL) {
                                /*
                                 * open(O_CREAT | O_EXCL) needs to check
@@ -310,8 +309,7 @@ static int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
                                 * file under old layout, check old layout on
                                 * client side.
                                 */
-                               tgt = lmv_locate_tgt(lmv, op_data,
-                                                    &op_data->op_fid1);
+                               tgt = lmv_locate_tgt(lmv, op_data);
                                if (IS_ERR(tgt))
                                        RETURN(PTR_ERR(tgt));
 
@@ -345,21 +343,21 @@ retry:
                /* for striped directory, we can't know parent stripe fid
                 * without name, but we can set it to child fid, and MDT
                 * will obtain it from linkea in open in such case. */
-               if (op_data->op_mea1 != NULL)
+               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);
                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(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, &op_data->op_fid1);
+               tgt = lmv_locate_tgt(lmv, op_data);
                if (IS_ERR(tgt))
                        RETURN(PTR_ERR(tgt));
        }
@@ -379,7 +377,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);
@@ -445,8 +443,7 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
        ENTRY;
 
        /* foreign dir is not striped */
-       if (op_data->op_mea1 &&
-           op_data->op_mea1->lsm_md_magic == LMV_MAGIC_FOREIGN) {
+       if (lmv_dir_foreign(op_data->op_mea1)) {
                /* only allow getattr/lookup for itself */
                if (op_data->op_name != NULL)
                        RETURN(-ENODATA);
@@ -454,7 +451,7 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
        }
 
 retry:
-       tgt = lmv_locate_tgt(lmv, op_data, &op_data->op_fid1);
+       tgt = lmv_locate_tgt(lmv, op_data);
        if (IS_ERR(tgt))
                RETURN(PTR_ERR(tgt));
 
@@ -465,7 +462,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;
 
@@ -477,7 +474,7 @@ retry:
        if (*reqp == NULL) {
                /* If RPC happens, lsm information will be revalidated
                 * during update_inode process (see ll_update_lsm_md) */
-               if (op_data->op_mea2 != NULL) {
+               if (lmv_dir_striped(op_data->op_mea2)) {
                        rc = lmv_revalidate_slaves(exp, op_data->op_mea2,
                                                   cb_blocking,
                                                   extra_lock_flags);