LU-6142 ldlm: remove ldlm typedef usage from code

[fs/lustre-release.git] / lustre / mdt / mdt_reint.c

diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index fb25134..f2514c7 100644 (file)
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -407,8 +407,8 @@ static int mdt_unlock_slaves(struct mdt_thread_info *mti,
                             struct mdt_object *s0_obj,
                             struct ldlm_enqueue_info *einfo)
 {
-       ldlm_policy_data_t      *policy = &mti->mti_policy;
-       int                     rc;
+       union ldlm_policy_data *policy = &mti->mti_policy;
+       int rc;
        ENTRY;
 
        if (!S_ISDIR(obj->mot_header.loh_attr))
@@ -433,15 +433,15 @@ static int mdt_unlock_slaves(struct mdt_thread_info *mti,
  * will be stored in einfo->ei_cbdata.
  **/
 static int mdt_lock_slaves(struct mdt_thread_info *mti, struct mdt_object *obj,
-                          ldlm_mode_t mode, __u64 ibits,
+                          enum ldlm_mode mode, __u64 ibits,
                           struct mdt_lock_handle *s0_lh,
                           struct mdt_object **s0_objp,
                           struct ldlm_enqueue_info *einfo)
 {
-       ldlm_policy_data_t      *policy = &mti->mti_policy;
-       struct lu_buf           *buf = &mti->mti_buf;
-       struct lmv_mds_md_v1    *lmv;
-       struct lu_fid           *fid = &mti->mti_tmp_fid1;
+       union ldlm_policy_data *policy = &mti->mti_policy;
+       struct lu_buf *buf = &mti->mti_buf;
+       struct lmv_mds_md_v1 *lmv;
+       struct lu_fid *fid = &mti->mti_tmp_fid1;
        int rc;
        ENTRY;
 
@@ -1106,7 +1106,7 @@ static int mdt_pdir_hash_lock(struct mdt_thread_info *info,
 {
        struct ldlm_res_id *res = &info->mti_res_id;
        struct ldlm_namespace *ns = info->mti_mdt->mdt_namespace;
-       ldlm_policy_data_t *policy = &info->mti_policy;
+       union ldlm_policy_data *policy = &info->mti_policy;
        int rc;
 
        /*
@@ -1155,10 +1155,10 @@ static int mdt_rename_lock(struct mdt_thread_info *info,
                                            MDS_INODELOCK_UPDATE, false);
                mdt_object_put(info->mti_env, obj);
        } else {
-               struct ldlm_namespace   *ns = info->mti_mdt->mdt_namespace;
-               ldlm_policy_data_t      *policy = &info->mti_policy;
-               struct ldlm_res_id      *res_id = &info->mti_res_id;
-               __u64                   flags = 0;
+               struct ldlm_namespace *ns = info->mti_mdt->mdt_namespace;
+               union ldlm_policy_data *policy = &info->mti_policy;
+               struct ldlm_res_id *res_id = &info->mti_res_id;
+               __u64 flags = 0;
 
                fid_build_reg_res_name(&LUSTRE_BFL_FID, res_id);
                memset(policy, 0, sizeof *policy);