Whamcloud - gitweb
LU-3544 fid: do open-by-fid by default
[fs/lustre-release.git] / lustre / lmv / lmv_intent.c
index da76f8f..fa0f194 100644 (file)
@@ -80,7 +80,7 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
        if (body == NULL)
                RETURN(-EPROTO);
 
-       LASSERT((body->valid & OBD_MD_MDS));
+       LASSERT((body->mbo_valid & OBD_MD_MDS));
 
        /*
         * Unfortunately, we have to lie to MDC/MDS to retrieve
@@ -99,9 +99,9 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
                it->d.lustre.it_data = NULL;
        }
 
-       LASSERT(fid_is_sane(&body->fid1));
+       LASSERT(fid_is_sane(&body->mbo_fid1));
 
-       tgt = lmv_find_target(lmv, &body->fid1);
+       tgt = lmv_find_target(lmv, &body->mbo_fid1);
        if (IS_ERR(tgt))
                GOTO(out, rc = PTR_ERR(tgt));
 
@@ -109,7 +109,7 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
        if (op_data == NULL)
                GOTO(out, rc = -ENOMEM);
 
-       op_data->op_fid1 = body->fid1;
+       op_data->op_fid1 = body->mbo_fid1;
        /* Sent the parent FID to the remote MDT */
        if (parent_fid != NULL) {
                /* The parent fid is only for remote open to
@@ -117,14 +117,11 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
                 * see mdt_cross_open */
                LASSERT(it->it_op & IT_OPEN);
                op_data->op_fid2 = *parent_fid;
-               /* Add object FID to op_fid3, in case it needs to check stale
-                * (M_CHECK_STALE), see mdc_finish_intent_lock */
-               op_data->op_fid3 = body->fid1;
        }
 
        op_data->op_bias = MDS_CROSS_REF;
        CDEBUG(D_INODE, "REMOTE_INTENT with fid="DFID" -> mds #%d\n",
-              PFID(&body->fid1), tgt->ltd_idx);
+              PFID(&body->mbo_fid1), tgt->ltd_idx);
 
        rc = md_intent_lock(tgt->ltd_exp, op_data, it, &req, cb_blocking,
                            extra_lock_flags);
@@ -234,10 +231,11 @@ int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
                        body = req_capsule_server_get(&req->rq_pill,
                                                      &RMF_MDT_BODY);
                        LASSERT(body != NULL);
-                       if (unlikely(body->nlink < 2)) {
+                       if (unlikely(body->mbo_nlink < 2)) {
                                CERROR("%s: nlink %d < 2 corrupt stripe %d "DFID
-                                      ":" DFID"\n", obd->obd_name, body->nlink,
-                                      i, PFID(&lsm->lsm_md_oinfo[i].lmo_fid),
+                                      ":" DFID"\n",
+                                      obd->obd_name, body->mbo_nlink, i,
+                                      PFID(&lsm->lsm_md_oinfo[i].lmo_fid),
                                       PFID(&lsm->lsm_md_oinfo[0].lmo_fid));
 
                                if (req != NULL)
@@ -253,11 +251,11 @@ int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
                        }
 
 
-                       i_size_write(inode, body->size);
-                       set_nlink(inode, body->nlink);
-                       LTIME_S(inode->i_atime) = body->atime;
-                       LTIME_S(inode->i_ctime) = body->ctime;
-                       LTIME_S(inode->i_mtime) = body->mtime;
+                       i_size_write(inode, body->mbo_size);
+                       set_nlink(inode, body->mbo_nlink);
+                       LTIME_S(inode->i_atime) = body->mbo_atime;
+                       LTIME_S(inode->i_ctime) = body->mbo_ctime;
+                       LTIME_S(inode->i_mtime) = body->mbo_mtime;
 
                        if (req != NULL)
                                ptlrpc_req_finished(req);
@@ -299,9 +297,9 @@ int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
               atime, ctime, mtime, PFID(&lsm->lsm_md_oinfo[0].lmo_fid));
 
        if (mbody != NULL) {
-               mbody->atime = atime;
-               mbody->ctime = ctime;
-               mbody->mtime = mtime;
+               mbody->mbo_atime = atime;
+               mbody->mbo_ctime = ctime;
+               mbody->mbo_mtime = mtime;
        }
 cleanup:
        OBD_FREE_PTR(op_data);
@@ -335,19 +333,14 @@ int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
        int                     rc;
        ENTRY;
 
-       /* Note: client might open with some random flags(sanity 33b), so we can
-        * not make sure op_fid2 is being initialized with BY_FID flag */
-       if (it->it_flags & MDS_OPEN_BY_FID && fid_is_sane(&op_data->op_fid2)) {
-               if (op_data->op_mea1 != NULL) {
-                       struct lmv_stripe_md    *lsm = op_data->op_mea1;
-                       const struct lmv_oinfo  *oinfo;
-
-                       oinfo = lsm_name_to_stripe_info(lsm, op_data->op_name,
-                                                       op_data->op_namelen);
-                       if (IS_ERR(oinfo))
-                               RETURN(PTR_ERR(oinfo));
-                       op_data->op_fid1 = oinfo->lmo_fid;
-               }
+       if (it->it_flags & MDS_OPEN_BY_FID) {
+               LASSERT(fid_is_sane(&op_data->op_fid2));
+
+               /* 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)
+                       op_data->op_fid1 = op_data->op_fid2;
 
                tgt = lmv_find_target(lmv, &op_data->op_fid2);
                if (IS_ERR(tgt))
@@ -355,6 +348,10 @@ int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
 
                op_data->op_mds = tgt->ltd_idx;
        } else {
+               LASSERT(fid_is_sane(&op_data->op_fid1));
+               LASSERT(fid_is_zero(&op_data->op_fid2));
+               LASSERT(op_data->op_name != NULL);
+
                tgt = lmv_locate_mds(lmv, op_data, &op_data->op_fid1);
                if (IS_ERR(tgt))
                        RETURN(PTR_ERR(tgt));
@@ -362,13 +359,11 @@ int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
 
        /* 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)) {
                /*
-                * For open with IT_CREATE and for IT_CREATE cases allocate new
-                * fid and setup FLD for it.
+                * For lookup(IT_CREATE) cases allocate new fid and setup FLD
+                * for it.
                 */
-               op_data->op_fid3 = op_data->op_fid2;
                rc = lmv_fid_alloc(NULL, exp, &op_data->op_fid2, op_data);
                if (rc != 0)
                        RETURN(rc);
@@ -396,7 +391,7 @@ int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
                RETURN(-EPROTO);
 
        /* Not cross-ref case, just get out of here. */
-       if (unlikely((body->valid & OBD_MD_MDS))) {
+       if (unlikely((body->mbo_valid & OBD_MD_MDS))) {
                rc = lmv_intent_remote(exp, it, &op_data->op_fid1, reqp,
                                       cb_blocking, extra_lock_flags);
                if (rc != 0)
@@ -488,7 +483,7 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
                RETURN(-EPROTO);
 
        /* Not cross-ref case, just get out of here. */
-       if (unlikely((body->valid & OBD_MD_MDS))) {
+       if (unlikely((body->mbo_valid & OBD_MD_MDS))) {
                rc = lmv_intent_remote(exp, it, NULL, reqp, cb_blocking,
                                       extra_lock_flags);
                if (rc != 0)
@@ -506,20 +501,20 @@ int lmv_intent_lock(struct obd_export *exp, struct md_op_data *op_data,
                    ldlm_blocking_callback cb_blocking,
                    __u64 extra_lock_flags)
 {
-        struct obd_device *obd = exp->exp_obd;
-        int                rc;
-        ENTRY;
+       struct obd_device *obd = exp->exp_obd;
+       int                rc;
+       ENTRY;
 
-        LASSERT(it != NULL);
-        LASSERT(fid_is_sane(&op_data->op_fid1));
+       LASSERT(it != NULL);
+       LASSERT(fid_is_sane(&op_data->op_fid1));
 
-        CDEBUG(D_INODE, "INTENT LOCK '%s' for '%*s' on "DFID"\n",
-               LL_IT2STR(it), op_data->op_namelen, op_data->op_name,
-               PFID(&op_data->op_fid1));
+       CDEBUG(D_INODE, "INTENT LOCK '%s' for "DFID" '%.*s' on "DFID"\n",
+               LL_IT2STR(it), PFID(&op_data->op_fid2), op_data->op_namelen,
+               op_data->op_name, PFID(&op_data->op_fid1));
 
-        rc = lmv_check_connect(obd);
-        if (rc)
-                RETURN(rc);
+       rc = lmv_check_connect(obd);
+       if (rc)
+               RETURN(rc);
 
        if (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_LAYOUT))
                rc = lmv_intent_lookup(exp, op_data, it, reqp, cb_blocking,