LU-2675 mdt: add mbo_ prefix to members of struct mdt_body

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

diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
index da76f8f..22a0d21 100644 (file)
--- a/lustre/lmv/lmv_intent.c
+++ b/lustre/lmv/lmv_intent.c
@@ -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
@@ -119,12 +119,12 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
                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_fid3 = body->mbo_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 +234,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 +254,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 +300,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);
@@ -396,7 +397,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 +489,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)