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

[fs/lustre-release.git] / lustre / llite / file.c

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 2d2451b..8f7321d 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -208,7 +208,7 @@ static int ll_close_inode_openhandle(struct obd_export *md_exp,
        if (rc == 0 && op_data->op_bias & MDS_HSM_RELEASE) {
                struct mdt_body *body;
                body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
-               if (!(body->valid & OBD_MD_FLRELEASED))
+               if (!(body->mbo_valid & OBD_MD_FLRELEASED))
                        rc = -EBUSY;
        }
 
@@ -506,8 +506,8 @@ static int ll_och_fill(struct obd_export *md_exp, struct lookup_intent *it,
        struct mdt_body *body;
 
        body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
-       och->och_fh = body->handle;
-       och->och_fid = body->fid1;
+       och->och_fh = body->mbo_handle;
+       och->och_fid = body->mbo_fid1;
        och->och_lease_handle.cookie = it->d.lustre.it_lock_handle;
        och->och_magic = OBD_CLIENT_HANDLE_MAGIC;
        och->och_flags = it->it_flags;
@@ -536,7 +536,7 @@ static int ll_local_open(struct file *file, struct lookup_intent *it,
                        RETURN(rc);
 
                body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
-               ll_ioepoch_open(lli, body->ioepoch);
+               ll_ioepoch_open(lli, body->mbo_ioepoch);
        }
 
        LUSTRE_FPRIVATE(file) = fd;
@@ -1571,9 +1571,9 @@ int ll_lov_getstripe_ea_info(struct inode *inode, const char *filename,
         body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
         LASSERT(body != NULL); /* checked by mdc_getattr_name */
 
-        lmmsize = body->eadatasize;
+       lmmsize = body->mbo_eadatasize;
 
-        if (!(body->valid & (OBD_MD_FLEASIZE | OBD_MD_FLDIREA)) ||
+       if (!(body->mbo_valid & (OBD_MD_FLEASIZE | OBD_MD_FLDIREA)) ||
                         lmmsize == 0) {
                 GOTO(out, rc = -ENODATA);
         }
@@ -1602,13 +1602,14 @@ int ll_lov_getstripe_ea_info(struct inode *inode, const char *filename,
                  * avoid swab not existent lsm objects */
                 if (lmm->lmm_magic == cpu_to_le32(LOV_MAGIC_V1)) {
                         lustre_swab_lov_user_md_v1((struct lov_user_md_v1 *)lmm);
-                        if (S_ISREG(body->mode))
-                                lustre_swab_lov_user_md_objects(
-                                 ((struct lov_user_md_v1 *)lmm)->lmm_objects,
-                                 stripe_count);
-                } else if (lmm->lmm_magic == cpu_to_le32(LOV_MAGIC_V3)) {
-                        lustre_swab_lov_user_md_v3((struct lov_user_md_v3 *)lmm);
-                        if (S_ISREG(body->mode))
+                       if (S_ISREG(body->mbo_mode))
+                               lustre_swab_lov_user_md_objects(
+                                   ((struct lov_user_md_v1 *)lmm)->lmm_objects,
+                                   stripe_count);
+               } else if (lmm->lmm_magic == cpu_to_le32(LOV_MAGIC_V3)) {
+                       lustre_swab_lov_user_md_v3(
+                               (struct lov_user_md_v3 *)lmm);
+                       if (S_ISREG(body->mbo_mode))
                                 lustre_swab_lov_user_md_objects(
                                  ((struct lov_user_md_v3 *)lmm)->lmm_objects,
                                  stripe_count);
@@ -3045,7 +3046,7 @@ int ll_get_fid_by_name(struct inode *parent, const char *name,
        if (body == NULL)
                GOTO(out_req, rc = -EFAULT);
        if (fid != NULL)
-               *fid = body->fid1;
+               *fid = body->mbo_fid1;
 out_req:
        ptlrpc_req_finished(req);
        RETURN(rc);
@@ -3835,7 +3836,7 @@ static int ll_layout_fetch(struct inode *inode, struct ldlm_lock *lock)
        if (body == NULL)
                GOTO(out, rc = -EPROTO);
 
-       lmmsize = body->eadatasize;
+       lmmsize = body->mbo_eadatasize;
        if (lmmsize == 0) /* empty layout */
                GOTO(out, rc = 0);