Whamcloud - gitweb
LU-6047 mdt: remove Size on MDS support
[fs/lustre-release.git] / lustre / mdt / mdt_reint.c
index 4d7aebf..bbb20c3 100644 (file)
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -46,7 +46,9 @@
 
 #define DEBUG_SUBSYSTEM S_MDS
 
+#include <lprocfs_status.h>
 #include "mdt_internal.h"
+#include <lustre_lmv.h>
 
 static inline void mdt_reint_init_ma(struct mdt_thread_info *info,
                                      struct md_attr *ma)
@@ -63,11 +65,11 @@ static int mdt_create_pack_capa(struct mdt_thread_info *info, int rc,
 
         /* for cross-ref mkdir, mds capa has been fetched from remote obj, then
          * we won't go to below*/
-        if (repbody->valid & OBD_MD_FLMDSCAPA)
+       if (repbody->mbo_valid & OBD_MD_FLMDSCAPA)
                 RETURN(rc);
 
-        if (rc == 0 && info->mti_mdt->mdt_opts.mo_mds_capa &&
-            info->mti_exp->exp_connect_flags & OBD_CONNECT_MDS_CAPA) {
+       if (rc == 0 && info->mti_mdt->mdt_lut.lut_mds_capa &&
+           exp_connect_flags(info->mti_exp) & OBD_CONNECT_MDS_CAPA) {
                 struct lustre_capa *capa;
 
                 capa = req_capsule_server_get(info->mti_pill, &RMF_CAPA1);
@@ -76,7 +78,7 @@ static int mdt_create_pack_capa(struct mdt_thread_info *info, int rc,
                 rc = mo_capa_get(info->mti_env, mdt_object_child(object), capa,
                                  0);
                 if (rc == 0)
-                        repbody->valid |= OBD_MD_FLMDSCAPA;
+                       repbody->mbo_valid |= OBD_MD_FLMDSCAPA;
         }
 
         RETURN(rc);
@@ -91,8 +93,8 @@ static void mdt_obj_version_get(struct mdt_thread_info *info,
                                 struct mdt_object *o, __u64 *version)
 {
         LASSERT(o);
-        LASSERT(mdt_object_exists(o) >= 0);
-       if (mdt_object_exists(o) > 0 && !mdt_object_obf(o))
+       if (mdt_object_exists(o) && !mdt_object_remote(o) &&
+           !fid_is_obf(mdt_object_fid(o)))
                 *version = dt_version_get(info->mti_env, mdt_obj2dt(o));
         else
                 *version = ENOENT_VERSION;
@@ -218,9 +220,10 @@ int mdt_version_get_check_save(struct mdt_thread_info *info,
  * This checks version of 'name'. Many reint functions uses 'name' for child not
  * FID, therefore we need to get object by name and check its version.
  */
-int mdt_lookup_version_check(struct mdt_thread_info *info,
-                             struct mdt_object *p, struct lu_name *lname,
-                             struct lu_fid *fid, int idx)
+static int mdt_lookup_version_check(struct mdt_thread_info *info,
+                                   struct mdt_object *p,
+                                   const struct lu_name *lname,
+                                   struct lu_fid *fid, int idx)
 {
         int rc, vbrc;
 
@@ -244,6 +247,84 @@ int mdt_lookup_version_check(struct mdt_thread_info *info,
 
 }
 
+/**
+ * mdt_remote_permission: Check whether the remote operation is permitted,
+ *
+ * Before we implement async cross-MDT updates (DNE phase 2). There are a few
+ * limitations here:
+ *
+ * 1.Only sysadmin can create remote directory and striped directory and
+ *   migrate directory now, unless
+ *   lctl set_param mdt.*.enable_remote_dir_gid=allow_gid.
+ * 2.Remote directory can only be created on MDT0, unless
+ *   lctl set_param mdt.*.enable_remote_dir = 1
+ * 3.Only new clients can access remote dir( >= 2.4) and striped dir(>= 2.6),
+ *   old client will return -ENOTSUPP.
+ *
+ * XXX these check are only needed for remote synchronization, once async
+ * update is supported, these check will be removed.
+ *
+ * param[in]info:      execution environment.
+ * param[in]parent:    the directory of this operation.
+ * param[in]child:     the child of this operation.
+ *
+ * retval      = 0 remote operation is allowed.
+ *              < 0 remote operation is denied.
+ */
+static int mdt_remote_permission(struct mdt_thread_info *info,
+                                struct mdt_object *parent,
+                                struct mdt_object *child)
+{
+       struct mdt_device       *mdt = info->mti_mdt;
+       struct lu_ucred         *uc  = mdt_ucred(info);
+       struct md_op_spec       *spec = &info->mti_spec;
+       struct lu_attr          *attr = &info->mti_attr.ma_attr;
+       struct obd_export       *exp = mdt_info_req(info)->rq_export;
+
+       /* Only check create remote directory, striped directory and
+        * migration */
+       if (mdt_object_remote(parent) == 0 && mdt_object_remote(child) == 0 &&
+           !(S_ISDIR(attr->la_mode) && spec->u.sp_ea.eadata != NULL &&
+                                       spec->u.sp_ea.eadatalen != 0) &&
+           info->mti_rr.rr_opcode != REINT_MIGRATE)
+               return 0;
+
+       if (!md_capable(uc, CFS_CAP_SYS_ADMIN)) {
+               if (uc->uc_gid != mdt->mdt_enable_remote_dir_gid &&
+                   mdt->mdt_enable_remote_dir_gid != -1)
+                       return -EPERM;
+       }
+
+       if (mdt->mdt_enable_remote_dir == 0) {
+               struct seq_server_site  *ss = mdt_seq_site(mdt);
+               struct lu_seq_range     range = { 0 };
+               int                     rc;
+
+               fld_range_set_type(&range, LU_SEQ_RANGE_MDT);
+               rc = fld_server_lookup(info->mti_env, ss->ss_server_fld,
+                                      fid_seq(mdt_object_fid(parent)), &range);
+               if (rc != 0)
+                       return rc;
+
+               if (range.lsr_index != 0)
+                       return -EPERM;
+       }
+
+       if (!mdt_is_dne_client(exp))
+               return -ENOTSUPP;
+
+       if (S_ISDIR(attr->la_mode) && spec->u.sp_ea.eadata != NULL &&
+           spec->u.sp_ea.eadatalen != 0) {
+               const struct lmv_user_md *lum = spec->u.sp_ea.eadata;
+
+               if (le32_to_cpu(lum->lum_stripe_count) > 1 &&
+                   !mdt_is_striped_client(exp))
+                       return -ENOTSUPP;
+       }
+
+       return 0;
+}
+
 /*
  * VBR: we save three versions in reply:
  * 0 - parent. Check that parent version is the same during replay.
@@ -261,43 +342,50 @@ static int mdt_md_create(struct mdt_thread_info *info)
         struct mdt_body         *repbody;
         struct md_attr          *ma = &info->mti_attr;
         struct mdt_reint_record *rr = &info->mti_rr;
-        struct lu_name          *lname;
         int rc;
         ENTRY;
 
-        DEBUG_REQ(D_INODE, mdt_info_req(info), "Create  (%s->"DFID") in "DFID,
-                  rr->rr_name, PFID(rr->rr_fid2), PFID(rr->rr_fid1));
+       DEBUG_REQ(D_INODE, mdt_info_req(info), "Create  ("DNAME"->"DFID") "
+                 "in "DFID,
+                 PNAME(&rr->rr_name), PFID(rr->rr_fid2), PFID(rr->rr_fid1));
 
-        repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
+       if (!fid_is_md_operative(rr->rr_fid1))
+               RETURN(-EPERM);
 
-        lh = &info->mti_lh[MDT_LH_PARENT];
-        mdt_lock_pdo_init(lh, LCK_PW, rr->rr_name, rr->rr_namelen);
+       repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
 
-        parent = mdt_object_find_lock(info, rr->rr_fid1, lh,
-                                      MDS_INODELOCK_UPDATE);
-        if (IS_ERR(parent))
-                RETURN(PTR_ERR(parent));
+       parent = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid1);
+       if (IS_ERR(parent))
+               RETURN(PTR_ERR(parent));
 
-        if (mdt_object_obf(parent))
-                GOTO(out_put_parent, rc = -EPERM);
+       if (!mdt_object_exists(parent))
+               GOTO(put_parent, rc = -ENOENT);
 
-        rc = mdt_version_get_check_save(info, parent, 0);
-        if (rc)
-                GOTO(out_put_parent, rc);
+       lh = &info->mti_lh[MDT_LH_PARENT];
+       mdt_lock_pdo_init(lh, LCK_PW, &rr->rr_name);
+       rc = mdt_object_lock(info, parent, lh, MDS_INODELOCK_UPDATE,
+                            MDT_CROSS_LOCK);
+       if (rc)
+               GOTO(put_parent, rc);
 
-        /*
-         * Check child name version during replay.
-         * During create replay a file may exist with same name.
-         */
-        lname = mdt_name(info->mti_env, (char *)rr->rr_name, rr->rr_namelen);
-        rc = mdt_lookup_version_check(info, parent, lname,
-                                      &info->mti_tmp_fid1, 1);
+       if (!mdt_object_remote(parent)) {
+               rc = mdt_version_get_check_save(info, parent, 0);
+               if (rc)
+                       GOTO(unlock_parent, rc);
+       }
+
+       /*
+        * Check child name version during replay.
+        * During create replay a file may exist with same name.
+        */
+       rc = mdt_lookup_version_check(info, parent, &rr->rr_name,
+                                     &info->mti_tmp_fid1, 1);
        if (rc == 0)
-               GOTO(out_put_parent, rc = -EEXIST);
+               GOTO(unlock_parent, rc = -EEXIST);
 
        /* -ENOENT is expected here */
        if (rc != -ENOENT)
-               GOTO(out_put_parent, rc);
+               GOTO(unlock_parent, rc);
 
        /* save version of file name for replay, it must be ENOENT here */
        mdt_enoent_version_save(info, 1);
@@ -306,20 +394,11 @@ static int mdt_md_create(struct mdt_thread_info *info)
         if (likely(!IS_ERR(child))) {
                 struct md_object *next = mdt_object_child(parent);
 
-               if (mdt_object_exists(child) < 0) {
-                       struct seq_server_site *ss;
-
-                       ss = mdt_seq_site(mdt);
-                       if (ss->ss_node_id != 0 &&
-                           mdt->mdt_enable_remote_dir == 0) {
-                               CERROR("%s: remote dir is only permitted on"
-                                      " MDT0 or set_param"
-                                      " mdt.*.enable_remote_dir=1\n",
-                                      mdt2obd_dev(mdt)->obd_name);
-                               GOTO(out_put_child, rc = -EPERM);
-                       }
-               }
-                ma->ma_need = MA_INODE;
+               rc = mdt_remote_permission(info, parent, child);
+               if (rc != 0)
+                       GOTO(out_put_child, rc);
+
+               ma->ma_need = MA_INODE;
                 ma->ma_valid = 0;
                 /* capa for cross-ref will be stored here */
                 ma->ma_capa = req_capsule_server_get(info->mti_pill,
@@ -330,7 +409,7 @@ static int mdt_md_create(struct mdt_thread_info *info)
                                OBD_FAIL_MDS_REINT_CREATE_WRITE);
 
                 /* Version of child will be updated on disk. */
-                info->mti_mos = child;
+               tgt_vbr_obj_set(info->mti_env, mdt_obj2dt(child));
                 rc = mdt_version_get_check_save(info, child, 2);
                 if (rc)
                         GOTO(out_put_child, rc);
@@ -346,53 +425,154 @@ static int mdt_md_create(struct mdt_thread_info *info)
                info->mti_spec.sp_cr_lookup = 0;
                 info->mti_spec.sp_feat = &dt_directory_features;
 
-                rc = mdo_create(info->mti_env, next, lname,
-                                mdt_object_child(child),
-                                &info->mti_spec, ma);
+               rc = mdo_create(info->mti_env, next, &rr->rr_name,
+                               mdt_object_child(child), &info->mti_spec, ma);
                if (rc == 0)
                        rc = mdt_attr_get_complex(info, child, ma);
 
-                if (rc == 0) {
-                        /* Return fid & attr to client. */
-                        if (ma->ma_valid & MA_INODE)
-                                mdt_pack_attr2body(info, repbody, &ma->ma_attr,
-                                                   mdt_object_fid(child));
-                }
+               if (rc == 0) {
+                       /* Return fid & attr to client. */
+                       if (ma->ma_valid & MA_INODE)
+                               mdt_pack_attr2body(info, repbody, &ma->ma_attr,
+                                                  mdt_object_fid(child));
+               }
 out_put_child:
-                mdt_object_put(info->mti_env, child);
-        } else {
-                rc = PTR_ERR(child);
-        }
-        mdt_create_pack_capa(info, rc, child, repbody);
-out_put_parent:
-        mdt_object_unlock_put(info, parent, lh, rc);
-        RETURN(rc);
+               mdt_create_pack_capa(info, rc, child, repbody);
+               mdt_object_put(info->mti_env, child);
+       } else {
+               rc = PTR_ERR(child);
+               mdt_create_pack_capa(info, rc, NULL, repbody);
+       }
+unlock_parent:
+       mdt_object_unlock(info, parent, lh, rc);
+put_parent:
+       mdt_object_put(info->mti_env, parent);
+       RETURN(rc);
 }
 
-int mdt_attr_set(struct mdt_thread_info *info, struct mdt_object *mo,
-                 struct md_attr *ma, int flags)
+static int mdt_unlock_slaves(struct mdt_thread_info *mti,
+                            struct mdt_object *obj, __u64 ibits,
+                            struct mdt_lock_handle *s0_lh,
+                            struct mdt_object *s0_obj,
+                            struct ldlm_enqueue_info *einfo)
 {
-        struct mdt_lock_handle  *lh;
-        int do_vbr = ma->ma_attr.la_valid & (LA_MODE|LA_UID|LA_GID|LA_FLAGS);
-        __u64 lockpart = MDS_INODELOCK_UPDATE;
-        int rc;
-        ENTRY;
+       ldlm_policy_data_t      *policy = &mti->mti_policy;
+       int                     rc;
+       ENTRY;
 
-        /* attr shouldn't be set on remote object */
-        LASSERT(mdt_object_exists(mo) >= 0);
+       if (!S_ISDIR(obj->mot_header.loh_attr))
+               RETURN(0);
+
+       /* Unlock stripe 0 */
+       if (s0_lh != NULL && lustre_handle_is_used(&s0_lh->mlh_reg_lh)) {
+               LASSERT(s0_obj != NULL);
+               mdt_object_unlock_put(mti, s0_obj, s0_lh, 1);
+       }
+
+       memset(policy, 0, sizeof(*policy));
+       policy->l_inodebits.bits = ibits;
+
+       rc = mo_object_unlock(mti->mti_env, mdt_object_child(obj), einfo,
+                             policy);
+       RETURN(rc);
+}
+
+/**
+ * Lock slave stripes if necessary, the lock handles of slave stripes
+ * 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,
+                          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;
+       int rc;
+       ENTRY;
+
+       if (!S_ISDIR(obj->mot_header.loh_attr))
+               RETURN(0);
+
+       buf->lb_buf = mti->mti_xattr_buf;
+       buf->lb_len = sizeof(mti->mti_xattr_buf);
+       rc = mo_xattr_get(mti->mti_env, mdt_object_child(obj), buf,
+                         XATTR_NAME_LMV);
+       if (rc == -ERANGE) {
+               rc = mdt_big_xattr_get(mti, obj, XATTR_NAME_LMV);
+               if (rc > 0) {
+                       buf->lb_buf = mti->mti_big_lmm;
+                       buf->lb_len = mti->mti_big_lmmsize;
+               }
+       }
+
+       if (rc == -ENODATA || rc == -ENOENT)
+               RETURN(0);
+
+       if (rc <= 0)
+               RETURN(rc);
+
+       lmv = buf->lb_buf;
+       if (le32_to_cpu(lmv->lmv_magic) != LMV_MAGIC_V1)
+               RETURN(-EINVAL);
+
+       /* Sigh, 0_stripe and master object are different
+        * object, though they are in the same MDT, to avoid
+        * adding osd_object_lock here, so we will enqueue the
+        * stripe0 lock in MDT0 for now */
+       fid_le_to_cpu(fid, &lmv->lmv_stripe_fids[0]);
+       *s0_objp = mdt_object_find_lock(mti, fid, s0_lh, ibits);
+       if (IS_ERR(*s0_objp))
+               RETURN(PTR_ERR(*s0_objp));
+
+       memset(einfo, 0, sizeof(*einfo));
+       einfo->ei_type = LDLM_IBITS;
+       einfo->ei_mode = mode;
+       einfo->ei_cb_bl = mdt_remote_blocking_ast;
+       einfo->ei_cb_cp = ldlm_completion_ast;
+       einfo->ei_enq_slave = 1;
+       memset(policy, 0, sizeof(*policy));
+       policy->l_inodebits.bits = ibits;
+
+       rc = mo_object_lock(mti->mti_env, mdt_object_child(obj), NULL, einfo,
+                           policy);
+       RETURN(rc);
+}
+
+static int mdt_attr_set(struct mdt_thread_info *info, struct mdt_object *mo,
+                       struct md_attr *ma)
+{
+       struct mdt_lock_handle  *lh;
+       int do_vbr = ma->ma_attr.la_valid & (LA_MODE|LA_UID|LA_GID|LA_FLAGS);
+       __u64 lockpart = MDS_INODELOCK_UPDATE;
+       struct ldlm_enqueue_info *einfo = &info->mti_einfo;
+       struct mdt_lock_handle  *s0_lh;
+       struct mdt_object       *s0_obj = NULL;
+       int rc;
+       ENTRY;
 
         lh = &info->mti_lh[MDT_LH_PARENT];
         mdt_lock_reg_init(lh, LCK_PW);
 
-        if (ma->ma_attr.la_valid & (LA_MODE|LA_UID|LA_GID))
-                lockpart |= MDS_INODELOCK_LOOKUP;
+       /* Even though the new MDT will grant PERM lock to the old
+        * client, but the old client will almost ignore that during
+        * So it needs to revoke both LOOKUP and PERM lock here, so
+        * both new and old client can cancel the dcache */
+       if (ma->ma_attr.la_valid & (LA_MODE|LA_UID|LA_GID))
+               lockpart |= MDS_INODELOCK_LOOKUP | MDS_INODELOCK_PERM;
 
         rc = mdt_object_lock(info, mo, lh, lockpart, MDT_LOCAL_LOCK);
         if (rc != 0)
                 RETURN(rc);
 
-        if (mdt_object_exists(mo) == 0)
-                GOTO(out_unlock, rc = -ENOENT);
+       s0_lh = &info->mti_lh[MDT_LH_LOCAL];
+       mdt_lock_reg_init(s0_lh, LCK_PW);
+       rc = mdt_lock_slaves(info, mo, LCK_PW, lockpart, s0_lh, &s0_obj, einfo);
+       if (rc != 0)
+               GOTO(out_unlock, rc);
 
         /* all attrs are packed into mti_attr in unpack_setattr */
         mdt_fail_write(info->mti_env, info->mti_mdt->mdt_bottom,
@@ -405,19 +585,28 @@ int mdt_attr_set(struct mdt_thread_info *info, struct mdt_object *mo,
         /* VBR: update version if attr changed are important for recovery */
         if (do_vbr) {
                 /* update on-disk version of changed object */
-                info->mti_mos = mo;
+               tgt_vbr_obj_set(info->mti_env, mdt_obj2dt(mo));
                 rc = mdt_version_get_check_save(info, mo, 0);
                 if (rc)
                         GOTO(out_unlock, rc);
         }
 
+       /* Ensure constant striping during chown(). See LU-2789. */
+       if (ma->ma_attr.la_valid & (LA_UID|LA_GID))
+               mutex_lock(&mo->mot_lov_mutex);
+
         /* all attrs are packed into mti_attr in unpack_setattr */
         rc = mo_attr_set(info->mti_env, mdt_object_child(mo), ma);
+
+       if (ma->ma_attr.la_valid & (LA_UID|LA_GID))
+               mutex_unlock(&mo->mot_lov_mutex);
+
         if (rc != 0)
                 GOTO(out_unlock, rc);
 
         EXIT;
 out_unlock:
+       mdt_unlock_slaves(info, mo, lockpart, s0_lh, s0_obj, einfo);
         mdt_object_unlock(info, mo, lh, rc);
         return rc;
 }
@@ -439,21 +628,28 @@ int mdt_add_dirty_flag(struct mdt_thread_info *info, struct mdt_object *mo,
        rc = mdt_attr_get_complex(info, mo, ma);
        if (rc) {
                CERROR("file attribute read error for "DFID": %d.\n",
-                       PFID(lu_object_fid(&mo->mot_obj.mo_lu)), rc);
+                       PFID(mdt_object_fid(mo)), rc);
                RETURN(rc);
        }
 
        /* If an up2date copy exists in the backend, add dirty flag */
        if ((ma->ma_valid & MA_HSM) && (ma->ma_hsm.mh_flags & HS_EXISTS)
            && !(ma->ma_hsm.mh_flags & (HS_DIRTY|HS_RELEASED))) {
+               struct mdt_lock_handle  *lh = &info->mti_lh[MDT_LH_CHILD];
 
                ma->ma_hsm.mh_flags |= HS_DIRTY;
+
+               mdt_lock_reg_init(lh, LCK_PW);
+               rc = mdt_object_lock(info, mo, lh, MDS_INODELOCK_XATTR,
+                                    MDT_LOCAL_LOCK);
+               if (rc != 0)
+                       RETURN(rc);
+
                rc = mdt_hsm_attr_set(info, mo, &ma->ma_hsm);
-               if (rc) {
+               if (rc)
                        CERROR("file attribute change error for "DFID": %d\n",
-                               PFID(lu_object_fid(&mo->mot_obj.mo_lu)), rc);
-                       RETURN(rc);
-               }
+                               PFID(mdt_object_fid(mo)), rc);
+               mdt_object_unlock(info, mo, lh, rc);
        }
 
        RETURN(rc);
@@ -465,103 +661,81 @@ static int mdt_reint_setattr(struct mdt_thread_info *info,
         struct md_attr          *ma = &info->mti_attr;
         struct mdt_reint_record *rr = &info->mti_rr;
         struct ptlrpc_request   *req = mdt_info_req(info);
-        struct mdt_export_data  *med = &req->rq_export->exp_mdt_data;
-        struct mdt_file_data    *mfd;
         struct mdt_object       *mo;
         struct mdt_body         *repbody;
-        int                      som_au, rc, rc2;
+       int                      rc, rc2;
         ENTRY;
 
         DEBUG_REQ(D_INODE, req, "setattr "DFID" %x", PFID(rr->rr_fid1),
                   (unsigned int)ma->ma_attr.la_valid);
 
-        if (info->mti_dlm_req)
-                ldlm_request_cancel(req, info->mti_dlm_req, 0);
+       if (info->mti_dlm_req)
+               ldlm_request_cancel(req, info->mti_dlm_req, 0, LATF_SKIP);
 
-        repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
+       repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
         mo = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid1);
         if (IS_ERR(mo))
                 GOTO(out, rc = PTR_ERR(mo));
 
-       if (mdt_object_obf(mo))
-               GOTO(out_put, rc = -EPERM);
-
-        /* start a log jounal handle if needed */
-        if (!(mdt_conn_flags(info) & OBD_CONNECT_SOM)) {
-                if ((ma->ma_attr.la_valid & LA_SIZE) ||
-                    (rr->rr_flags & MRF_OPEN_TRUNC)) {
-                        /* Check write access for the O_TRUNC case */
-                        if (mdt_write_read(mo) < 0)
-                                GOTO(out_put, rc = -ETXTBSY);
-                }
-        } else if (info->mti_ioepoch &&
-                   (info->mti_ioepoch->flags & MF_EPOCH_OPEN)) {
-                /* Truncate case. IOEpoch is opened. */
-                rc = mdt_write_get(mo);
-                if (rc)
-                        GOTO(out_put, rc);
+       if (!mdt_object_exists(mo))
+               GOTO(out_put, rc = -ENOENT);
 
-                mfd = mdt_mfd_new();
-                if (mfd == NULL) {
-                        mdt_write_put(mo);
-                        GOTO(out_put, rc = -ENOMEM);
-                }
+       if (mdt_object_remote(mo))
+               GOTO(out_put, rc = -EREMOTE);
 
-                mdt_ioepoch_open(info, mo, 0);
-                repbody->ioepoch = mo->mot_ioepoch;
-
-                mdt_object_get(info->mti_env, mo);
-                mdt_mfd_set_mode(mfd, MDS_FMODE_TRUNC);
-                mfd->mfd_object = mo;
-                mfd->mfd_xid = req->rq_xid;
-
-               spin_lock(&med->med_open_lock);
-               cfs_list_add(&mfd->mfd_list, &med->med_open_head);
-               spin_unlock(&med->med_open_lock);
-                repbody->handle.cookie = mfd->mfd_handle.h_cookie;
-        }
-
-        som_au = info->mti_ioepoch && info->mti_ioepoch->flags & MF_SOM_CHANGE;
-        if (som_au) {
-                /* SOM Attribute update case. Find the proper mfd and update
-                 * SOM attributes on the proper object. */
-                LASSERT(mdt_conn_flags(info) & OBD_CONNECT_SOM);
-                LASSERT(info->mti_ioepoch);
-
-               spin_lock(&med->med_open_lock);
-               mfd = mdt_handle2mfd(info, &info->mti_ioepoch->handle);
-               if (mfd == NULL) {
-                       spin_unlock(&med->med_open_lock);
-                        CDEBUG(D_INODE, "no handle for file close: "
-                               "fid = "DFID": cookie = "LPX64"\n",
-                               PFID(info->mti_rr.rr_fid1),
-                               info->mti_ioepoch->handle.cookie);
-                        GOTO(out_put, rc = -ESTALE);
-                }
-                LASSERT(mfd->mfd_mode == MDS_FMODE_SOM);
-                LASSERT(!(info->mti_ioepoch->flags & MF_EPOCH_CLOSE));
+       if ((ma->ma_attr.la_valid & LA_SIZE) ||
+           (rr->rr_flags & MRF_OPEN_TRUNC)) {
+               /* Check write access for the O_TRUNC case */
+               if (mdt_write_read(mo) < 0)
+                       GOTO(out_put, rc = -ETXTBSY);
+       }
 
-                class_handle_unhash(&mfd->mfd_handle);
-                cfs_list_del_init(&mfd->mfd_list);
-               spin_unlock(&med->med_open_lock);
+       if ((ma->ma_valid & MA_INODE) && ma->ma_attr.la_valid) {
+               if (ma->ma_valid & MA_LOV)
+                       GOTO(out_put, rc = -EPROTO);
 
-                mdt_mfd_close(info, mfd);
-       } else if ((ma->ma_valid & MA_INODE) && ma->ma_attr.la_valid) {
-               LASSERT((ma->ma_valid & MA_LOV) == 0);
-                rc = mdt_attr_set(info, mo, ma, rr->rr_flags);
+               rc = mdt_attr_set(info, mo, ma);
                 if (rc)
                         GOTO(out_put, rc);
        } else if ((ma->ma_valid & MA_LOV) && (ma->ma_valid & MA_INODE)) {
                struct lu_buf *buf  = &info->mti_buf;
-               LASSERT(ma->ma_attr.la_valid == 0);
+
+               if (ma->ma_attr.la_valid != 0)
+                       GOTO(out_put, rc = -EPROTO);
+
                buf->lb_buf = ma->ma_lmm;
                buf->lb_len = ma->ma_lmm_size;
                rc = mo_xattr_set(info->mti_env, mdt_object_child(mo),
                                  buf, XATTR_NAME_LOV, 0);
                if (rc)
                        GOTO(out_put, rc);
-       } else
-               LBUG();
+       } else if ((ma->ma_valid & MA_LMV) && (ma->ma_valid & MA_INODE)) {
+               struct lu_buf *buf  = &info->mti_buf;
+               struct mdt_lock_handle  *lh;
+
+               if (ma->ma_attr.la_valid != 0)
+                       GOTO(out_put, rc = -EPROTO);
+
+               lh = &info->mti_lh[MDT_LH_PARENT];
+               mdt_lock_reg_init(lh, LCK_PW);
+
+               rc = mdt_object_lock(info, mo, lh,
+                                    MDS_INODELOCK_XATTR,
+                                    MDT_LOCAL_LOCK);
+               if (rc != 0)
+                       GOTO(out_put, rc);
+
+               buf->lb_buf = ma->ma_lmv;
+               buf->lb_len = ma->ma_lmv_size;
+               rc = mo_xattr_set(info->mti_env, mdt_object_child(mo),
+                                 buf, XATTR_NAME_DEFAULT_LMV, 0);
+
+               mdt_object_unlock(info, mo, lh, rc);
+               if (rc)
+                       GOTO(out_put, rc);
+       } else {
+               GOTO(out_put, rc = -EPROTO);
+       }
 
        /* If file data is modified, add the dirty flag */
        if (ma->ma_attr_flags & MDS_DATA_MODIFIED)
@@ -570,15 +744,15 @@ static int mdt_reint_setattr(struct mdt_thread_info *info,
         ma->ma_need = MA_INODE;
         ma->ma_valid = 0;
        rc = mdt_attr_get_complex(info, mo, ma);
-        if (rc != 0)
-                GOTO(out_put, rc);
+       if (rc != 0)
+               GOTO(out_put, rc);
 
-        mdt_pack_attr2body(info, repbody, &ma->ma_attr, mdt_object_fid(mo));
+       mdt_pack_attr2body(info, repbody, &ma->ma_attr, mdt_object_fid(mo));
 
-        if (info->mti_mdt->mdt_opts.mo_oss_capa &&
-            info->mti_exp->exp_connect_flags & OBD_CONNECT_OSS_CAPA &&
-            S_ISREG(lu_object_attr(&mo->mot_obj.mo_lu)) &&
-            (ma->ma_attr.la_valid & LA_SIZE) && !som_au) {
+       if (info->mti_mdt->mdt_lut.lut_oss_capa &&
+           exp_connect_flags(info->mti_exp) & OBD_CONNECT_OSS_CAPA &&
+           S_ISREG(lu_object_attr(&mo->mot_obj)) &&
+           (ma->ma_attr.la_valid & LA_SIZE)) {
                 struct lustre_capa *capa;
 
                 capa = req_capsule_server_get(info->mti_pill, &RMF_CAPA2);
@@ -587,7 +761,7 @@ static int mdt_reint_setattr(struct mdt_thread_info *info,
                 rc = mo_capa_get(info->mti_env, mdt_object_child(mo), capa, 0);
                 if (rc)
                         GOTO(out_put, rc);
-                repbody->valid |= OBD_MD_FLOSSCAPA;
+               repbody->mbo_valid |= OBD_MD_FLOSSCAPA;
         }
 
         EXIT;
@@ -614,11 +788,14 @@ static int mdt_reint_create(struct mdt_thread_info *info,
         if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_CREATE))
                 RETURN(err_serious(-ESTALE));
 
-        if (info->mti_dlm_req)
-                ldlm_request_cancel(mdt_info_req(info), info->mti_dlm_req, 0);
+       if (info->mti_dlm_req)
+               ldlm_request_cancel(mdt_info_req(info),
+                                   info->mti_dlm_req, 0, LATF_SKIP);
+
+       if (!lu_name_is_valid(&info->mti_rr.rr_name))
+               RETURN(-EPROTO);
 
-       LASSERT(info->mti_rr.rr_namelen > 0);
-        switch (info->mti_attr.ma_attr.la_mode & S_IFMT) {
+       switch (info->mti_attr.ma_attr.la_mode & S_IFMT) {
        case S_IFDIR:
                mdt_counter_incr(req, LPROC_MDT_MKDIR);
                break;
@@ -633,7 +810,7 @@ static int mdt_reint_create(struct mdt_thread_info *info,
                break;
        default:
                CERROR("%s: Unsupported mode %o\n",
-                      mdt2obd_dev(info->mti_mdt)->obd_name,
+                      mdt_obd_name(info->mti_mdt),
                       info->mti_attr.ma_attr.la_mode);
                RETURN(err_serious(-EOPNOTSUPP));
        }
@@ -657,78 +834,181 @@ static int mdt_reint_unlink(struct mdt_thread_info *info,
         struct mdt_object       *mc;
         struct mdt_lock_handle  *parent_lh;
         struct mdt_lock_handle  *child_lh;
-        struct lu_name          *lname;
-        int                      rc;
-        ENTRY;
+       struct ldlm_enqueue_info *einfo = &info->mti_einfo;
+       struct mdt_lock_handle  *s0_lh = NULL;
+       struct mdt_object       *s0_obj = NULL;
+       int                     rc;
+       int                     no_name = 0;
+       ENTRY;
 
-        DEBUG_REQ(D_INODE, req, "unlink "DFID"/%s", PFID(rr->rr_fid1),
-                  rr->rr_name);
+       DEBUG_REQ(D_INODE, req, "unlink "DFID"/"DNAME"", PFID(rr->rr_fid1),
+                 PNAME(&rr->rr_name));
 
-        if (info->mti_dlm_req)
-                ldlm_request_cancel(req, info->mti_dlm_req, 0);
+       if (info->mti_dlm_req)
+               ldlm_request_cancel(req, info->mti_dlm_req, 0, LATF_SKIP);
 
         if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_UNLINK))
                 RETURN(err_serious(-ENOENT));
 
+       if (!fid_is_md_operative(rr->rr_fid1))
+               RETURN(-EPERM);
+
         /*
-        * step 1: lock the parent.
+        * step 1: Found the parent.
          */
-        parent_lh = &info->mti_lh[MDT_LH_PARENT];
-       mdt_lock_pdo_init(parent_lh, LCK_PW, rr->rr_name,
-                         rr->rr_namelen);
+       mp = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid1);
+       if (IS_ERR(mp)) {
+               rc = PTR_ERR(mp);
+               GOTO(out, rc);
+       }
 
-        mp = mdt_object_find_lock(info, rr->rr_fid1, parent_lh,
-                                  MDS_INODELOCK_UPDATE);
-       if (IS_ERR(mp))
-               GOTO(out, rc = PTR_ERR(mp));
+       parent_lh = &info->mti_lh[MDT_LH_PARENT];
+       mdt_lock_pdo_init(parent_lh, LCK_PW, &rr->rr_name);
+       rc = mdt_object_lock(info, mp, parent_lh, MDS_INODELOCK_UPDATE,
+                            MDT_CROSS_LOCK);
+       if (rc != 0)
+               GOTO(put_parent, rc);
 
-        if (mdt_object_obf(mp))
-                GOTO(out_unlock_parent, rc = -EPERM);
+       if (!mdt_object_remote(mp)) {
+               rc = mdt_version_get_check_save(info, mp, 0);
+               if (rc)
+                       GOTO(unlock_parent, rc);
+       }
 
-        rc = mdt_version_get_check_save(info, mp, 0);
-        if (rc)
-                GOTO(out_unlock_parent, rc);
+       /* step 2: find & lock the child */
+       /* lookup child object along with version checking */
+       fid_zero(child_fid);
+       rc = mdt_lookup_version_check(info, mp, &rr->rr_name, child_fid, 1);
+       if (rc != 0) {
+               /* Name might not be able to find during resend of
+                * remote unlink, considering following case.
+                * dir_A is a remote directory, the name entry of
+                * dir_A is on MDT0, the directory is on MDT1,
+                *
+                * 1. client sends unlink req to MDT1.
+                * 2. MDT1 sends name delete update to MDT0.
+                * 3. name entry is being deleted in MDT0 synchronously.
+                * 4. MDT1 is restarted.
+                * 5. client resends unlink req to MDT1. So it can not
+                *    find the name entry on MDT0 anymore.
+                * In this case, MDT1 only needs to destory the local
+                * directory.
+                * */
+               if (mdt_object_remote(mp) && rc == -ENOENT &&
+                   !fid_is_zero(rr->rr_fid2) &&
+                   lustre_msg_get_flags(req->rq_reqmsg) & MSG_RESENT) {
+                       no_name = 1;
+                       *child_fid = *rr->rr_fid2;
+                } else {
+                       GOTO(unlock_parent, rc);
+                }
+       }
 
-        mdt_reint_init_ma(info, ma);
+       if (!fid_is_md_operative(child_fid))
+               GOTO(unlock_parent, rc = -EPERM);
 
-        /* step 2: find & lock the child */
-        lname = mdt_name(info->mti_env, (char *)rr->rr_name, rr->rr_namelen);
-        /* lookup child object along with version checking */
-        fid_zero(child_fid);
-        rc = mdt_lookup_version_check(info, mp, lname, child_fid, 1);
-        if (rc != 0)
-                 GOTO(out_unlock_parent, rc);
+       /* We will lock the child regardless it is local or remote. No harm. */
+       mc = mdt_object_find(info->mti_env, info->mti_mdt, child_fid);
+       if (IS_ERR(mc))
+               GOTO(unlock_parent, rc = PTR_ERR(mc));
 
-        /* We will lock the child regardless it is local or remote. No harm. */
-        mc = mdt_object_find(info->mti_env, info->mti_mdt, child_fid);
-        if (IS_ERR(mc))
-                GOTO(out_unlock_parent, rc = PTR_ERR(mc));
         child_lh = &info->mti_lh[MDT_LH_CHILD];
         mdt_lock_reg_init(child_lh, LCK_EX);
-        rc = mdt_object_lock(info, mc, child_lh, MDS_INODELOCK_FULL,
-                             MDT_CROSS_LOCK);
-        if (rc != 0) {
-                mdt_object_put(info->mti_env, mc);
-                GOTO(out_unlock_parent, rc);
-        }
+       if (mdt_object_remote(mc)) {
+               struct mdt_body  *repbody;
+
+               if (!fid_is_zero(rr->rr_fid2)) {
+                       CDEBUG(D_INFO, "%s: name "DNAME" cannot find "DFID"\n",
+                              mdt_obd_name(info->mti_mdt),
+                              PNAME(&rr->rr_name), PFID(mdt_object_fid(mc)));
+                       GOTO(put_child, rc = -ENOENT);
+               }
+               CDEBUG(D_INFO, "%s: name "DNAME": "DFID" is on another MDT\n",
+                      mdt_obd_name(info->mti_mdt),
+                      PNAME(&rr->rr_name), PFID(mdt_object_fid(mc)));
+
+               if (!mdt_is_dne_client(req->rq_export))
+                       /* Return -ENOTSUPP for old client */
+                       GOTO(put_child, rc = -ENOTSUPP);
+
+               if (info->mti_spec.sp_rm_entry) {
+                       struct lu_ucred *uc  = mdt_ucred(info);
+
+                       if (!md_capable(uc, CFS_CAP_SYS_ADMIN)) {
+                               CERROR("%s: unlink remote entry is only "
+                                      "permitted for administrator: rc = %d\n",
+                                       mdt_obd_name(info->mti_mdt),
+                                       -EPERM);
+                               GOTO(put_child, rc = -EPERM);
+                       }
+
+                       ma->ma_need = MA_INODE;
+                       ma->ma_valid = 0;
+                       mdt_set_capainfo(info, 1, child_fid, BYPASS_CAPA);
+                       rc = mdo_unlink(info->mti_env, mdt_object_child(mp),
+                                       NULL, &rr->rr_name, ma, no_name);
+                       GOTO(put_child, rc);
+               }
+               /* Revoke the LOOKUP lock of the remote object granted by
+                * this MDT. Since the unlink will happen on another MDT,
+                * it will release the LOOKUP lock right away. Then What
+                * would happen if another client try to grab the LOOKUP
+                * lock at the same time with unlink XXX */
+               mdt_object_lock(info, mc, child_lh, MDS_INODELOCK_LOOKUP,
+                               MDT_CROSS_LOCK);
+               repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
+               LASSERT(repbody != NULL);
+               repbody->mbo_fid1 = *mdt_object_fid(mc);
+               repbody->mbo_valid |= (OBD_MD_FLID | OBD_MD_MDS);
+               GOTO(unlock_child, rc = -EREMOTE);
+       } else if (info->mti_spec.sp_rm_entry) {
+               rc = -EPERM;
+               CDEBUG(D_INFO, "%s: no rm_entry on local dir '"DNAME"': "
+                      "rc = %d\n",
+                      mdt_obd_name(info->mti_mdt), PNAME(&rr->rr_name), rc);
+               GOTO(put_child, rc);
+       }
+
+       /* We used to acquire MDS_INODELOCK_FULL here but we can't do
+        * this now because a running HSM restore on the child (unlink
+        * victim) will hold the layout lock. See LU-4002. */
+       rc = mdt_object_lock(info, mc, child_lh,
+                            MDS_INODELOCK_LOOKUP | MDS_INODELOCK_UPDATE,
+                            MDT_CROSS_LOCK);
+       if (rc != 0)
+               GOTO(put_child, rc);
+       /*
+        * Now we can only make sure we need MA_INODE, in mdd layer, will check
+        * whether need MA_LOV and MA_COOKIE.
+        */
+       ma->ma_need = MA_INODE;
+       ma->ma_valid = 0;
+
+       s0_lh = &info->mti_lh[MDT_LH_LOCAL];
+       mdt_lock_reg_init(s0_lh, LCK_EX);
+       rc = mdt_lock_slaves(info, mc, LCK_EX, MDS_INODELOCK_UPDATE, s0_lh,
+                            &s0_obj, einfo);
+       if (rc != 0)
+               GOTO(unlock_child, rc);
+
+       mdt_fail_write(info->mti_env, info->mti_mdt->mdt_bottom,
+                      OBD_FAIL_MDS_REINT_UNLINK_WRITE);
+       /* save version when object is locked */
+       mdt_version_get_save(info, mc, 1);
+
+       mdt_set_capainfo(info, 1, child_fid, BYPASS_CAPA);
+
+       mutex_lock(&mc->mot_lov_mutex);
+
+       rc = mdo_unlink(info->mti_env, mdt_object_child(mp),
+                       mdt_object_child(mc), &rr->rr_name, ma, no_name);
+
+       mutex_unlock(&mc->mot_lov_mutex);
 
-        mdt_fail_write(info->mti_env, info->mti_mdt->mdt_bottom,
-                       OBD_FAIL_MDS_REINT_UNLINK_WRITE);
-        /* save version when object is locked */
-        mdt_version_get_save(info, mc, 1);
-        /*
-         * Now we can only make sure we need MA_INODE, in mdd layer, will check
-         * whether need MA_LOV and MA_COOKIE.
-         */
-        ma->ma_need = MA_INODE;
-        ma->ma_valid = 0;
-        mdt_set_capainfo(info, 1, child_fid, BYPASS_CAPA);
-        rc = mdo_unlink(info->mti_env, mdt_object_child(mp),
-                        mdt_object_child(mc), lname, ma);
        if (rc == 0 && !lu_object_is_dying(&mc->mot_header))
                rc = mdt_attr_get_complex(info, mc, ma);
-        if (rc == 0)
-                mdt_handle_last_unlink(info, mc, ma);
+       if (rc == 0)
+               mdt_handle_last_unlink(info, mc, ma);
 
         if (ma->ma_valid & MA_INODE) {
                 switch (ma->ma_attr.la_mode & S_IFMT) {
@@ -751,9 +1031,15 @@ static int mdt_reint_unlink(struct mdt_thread_info *info,
 
         EXIT;
 
-        mdt_object_unlock_put(info, mc, child_lh, rc);
-out_unlock_parent:
-        mdt_object_unlock_put(info, mp, parent_lh, rc);
+unlock_child:
+       mdt_unlock_slaves(info, mc, MDS_INODELOCK_UPDATE, s0_lh, s0_obj, einfo);
+       mdt_object_unlock(info, mc, child_lh, rc);
+put_child:
+       mdt_object_put(info->mti_env, mc);
+unlock_parent:
+       mdt_object_unlock(info, mp, parent_lh, rc);
+put_parent:
+       mdt_object_put(info->mti_env, mp);
 out:
         return rc;
 }
@@ -772,40 +1058,41 @@ static int mdt_reint_link(struct mdt_thread_info *info,
         struct mdt_object       *mp;
         struct mdt_lock_handle  *lhs;
         struct mdt_lock_handle  *lhp;
-        struct lu_name          *lname;
         int rc;
         ENTRY;
 
-        DEBUG_REQ(D_INODE, req, "link "DFID" to "DFID"/%s",
-                  PFID(rr->rr_fid1), PFID(rr->rr_fid2), rr->rr_name);
+       DEBUG_REQ(D_INODE, req, "link "DFID" to "DFID"/"DNAME,
+                 PFID(rr->rr_fid1), PFID(rr->rr_fid2), PNAME(&rr->rr_name));
 
         if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_LINK))
                 RETURN(err_serious(-ENOENT));
 
-        if (info->mti_dlm_req)
-                ldlm_request_cancel(req, info->mti_dlm_req, 0);
+       if (info->mti_dlm_req)
+               ldlm_request_cancel(req, info->mti_dlm_req, 0, LATF_SKIP);
 
         /* Invalid case so return error immediately instead of
          * processing it */
         if (lu_fid_eq(rr->rr_fid1, rr->rr_fid2))
                 RETURN(-EPERM);
 
+       if (!fid_is_md_operative(rr->rr_fid1) ||
+           !fid_is_md_operative(rr->rr_fid2))
+               RETURN(-EPERM);
+
         /* step 1: find & lock the target parent dir */
         lhp = &info->mti_lh[MDT_LH_PARENT];
-        mdt_lock_pdo_init(lhp, LCK_PW, rr->rr_name,
-                          rr->rr_namelen);
+       mdt_lock_pdo_init(lhp, LCK_PW, &rr->rr_name);
         mp = mdt_object_find_lock(info, rr->rr_fid2, lhp,
                                   MDS_INODELOCK_UPDATE);
         if (IS_ERR(mp))
                 RETURN(PTR_ERR(mp));
 
-        if (mdt_object_obf(mp))
-                GOTO(out_unlock_parent, rc = -EPERM);
-
         rc = mdt_version_get_check_save(info, mp, 0);
         if (rc)
                 GOTO(out_unlock_parent, rc);
 
+       OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_RENAME3, 5);
+
         /* step 2: find & lock the source */
         lhs = &info->mti_lh[MDT_LH_CHILD];
         mdt_lock_reg_init(lhs, LCK_EX);
@@ -814,8 +1101,23 @@ static int mdt_reint_link(struct mdt_thread_info *info,
         if (IS_ERR(ms))
                 GOTO(out_unlock_parent, rc = PTR_ERR(ms));
 
-        rc = mdt_object_lock(info, ms, lhs, MDS_INODELOCK_UPDATE,
-                            MDT_CROSS_LOCK);
+       if (!mdt_object_exists(ms)) {
+               mdt_object_put(info->mti_env, ms);
+               CDEBUG(D_INFO, "%s: "DFID" does not exist.\n",
+                      mdt_obd_name(info->mti_mdt), PFID(rr->rr_fid1));
+               GOTO(out_unlock_parent, rc = -ENOENT);
+       }
+
+       if (mdt_object_remote(ms)) {
+               mdt_object_put(info->mti_env, ms);
+               CERROR("%s: source inode "DFID" on remote MDT from "DFID"\n",
+                      mdt_obd_name(info->mti_mdt), PFID(rr->rr_fid1),
+                      PFID(rr->rr_fid2));
+               GOTO(out_unlock_parent, rc = -EXDEV);
+       }
+
+       rc = mdt_object_lock(info, ms, lhs, MDS_INODELOCK_UPDATE |
+                            MDS_INODELOCK_XATTR, MDT_LOCAL_LOCK);
         if (rc != 0) {
                 mdt_object_put(info->mti_env, ms);
                 GOTO(out_unlock_parent, rc);
@@ -825,24 +1127,29 @@ static int mdt_reint_link(struct mdt_thread_info *info,
         mdt_fail_write(info->mti_env, info->mti_mdt->mdt_bottom,
                        OBD_FAIL_MDS_REINT_LINK_WRITE);
 
-        info->mti_mos = ms;
+       tgt_vbr_obj_set(info->mti_env, mdt_obj2dt(ms));
         rc = mdt_version_get_check_save(info, ms, 1);
         if (rc)
                 GOTO(out_unlock_child, rc);
 
-        lname = mdt_name(info->mti_env, (char *)rr->rr_name, rr->rr_namelen);
         /** check target version by name during replay */
-        rc = mdt_lookup_version_check(info, mp, lname, &info->mti_tmp_fid1, 2);
+       rc = mdt_lookup_version_check(info, mp, &rr->rr_name,
+                                     &info->mti_tmp_fid1, 2);
         if (rc != 0 && rc != -ENOENT)
                 GOTO(out_unlock_child, rc);
         /* save version of file name for replay, it must be ENOENT here */
         if (!req_is_replay(mdt_info_req(info))) {
+               if (rc != -ENOENT) {
+                       CDEBUG(D_INFO, "link target "DNAME" existed!\n",
+                              PNAME(&rr->rr_name));
+                       GOTO(out_unlock_child, rc = -EEXIST);
+               }
                 info->mti_ver[2] = ENOENT_VERSION;
                 mdt_version_save(mdt_info_req(info), info->mti_ver[2], 2);
         }
 
-        rc = mdo_link(info->mti_env, mdt_object_child(mp),
-                      mdt_object_child(ms), lname, ma);
+       rc = mdo_link(info->mti_env, mdt_object_child(mp),
+             mdt_object_child(ms), &rr->rr_name, ma);
 
         if (rc == 0)
                mdt_counter_incr(req, LPROC_MDT_LINK);
@@ -859,74 +1166,96 @@ out_unlock_parent:
  * (lh->mlh_pdo_hash) in parallel directory lock.
  */
 static int mdt_pdir_hash_lock(struct mdt_thread_info *info,
-                       struct mdt_lock_handle *lh,
-                       struct mdt_object *obj, __u64 ibits)
+                             struct mdt_lock_handle *lh,
+                             struct mdt_object *obj, __u64 ibits)
 {
-        struct ldlm_res_id *res_id = &info->mti_res_id;
-        struct ldlm_namespace *ns = info->mti_mdt->mdt_namespace;
-        ldlm_policy_data_t *policy = &info->mti_policy;
-        int rc;
+       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;
+       int rc;
 
-        /*
-         * Finish res_id initializing by name hash marking part of
-         * directory which is taking modification.
-         */
-        LASSERT(lh->mlh_pdo_hash != 0);
-        fid_build_pdo_res_name(mdt_object_fid(obj), lh->mlh_pdo_hash, res_id);
-        memset(policy, 0, sizeof(*policy));
-        policy->l_inodebits.bits = ibits;
-        /*
-         * Use LDLM_FL_LOCAL_ONLY for this lock. We do not know yet if it is
-         * going to be sent to client. If it is - mdt_intent_policy() path will
-         * fix it up and turn FL_LOCAL flag off.
-         */
-        rc = mdt_fid_lock(ns, &lh->mlh_reg_lh, lh->mlh_reg_mode, policy,
-                          res_id, LDLM_FL_LOCAL_ONLY | LDLM_FL_ATOMIC_CB,
-                          &info->mti_exp->exp_handle.h_cookie);
-        return rc;
+       /*
+        * Finish res_id initializing by name hash marking part of
+        * directory which is taking modification.
+        */
+       LASSERT(lh->mlh_pdo_hash != 0);
+       fid_build_pdo_res_name(mdt_object_fid(obj), lh->mlh_pdo_hash, res);
+       memset(policy, 0, sizeof(*policy));
+       policy->l_inodebits.bits = ibits;
+       /*
+        * Use LDLM_FL_LOCAL_ONLY for this lock. We do not know yet if it is
+        * going to be sent to client. If it is - mdt_intent_policy() path will
+        * fix it up and turn FL_LOCAL flag off.
+        */
+       rc = mdt_fid_lock(ns, &lh->mlh_reg_lh, lh->mlh_reg_mode, policy,
+                         res, LDLM_FL_LOCAL_ONLY | LDLM_FL_ATOMIC_CB,
+                         &info->mti_exp->exp_handle.h_cookie);
+       return rc;
 }
 
+enum mdt_rename_lock {
+       MRL_RENAME,
+       MRL_MIGRATE,
+};
+
+/**
+ * Get BFL lock for rename or migrate process, right now, it does not support
+ * cross-MDT rename, so we only need global rename lock during migration.
+ **/
 static int mdt_rename_lock(struct mdt_thread_info *info,
-                           struct lustre_handle *lh)
+                          struct lustre_handle *lh,
+                          enum mdt_rename_lock rename_lock)
 {
        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;
-       int rc;
+       int                     rc;
        ENTRY;
 
-       fid_build_reg_res_name(&LUSTRE_BFL_FID, res_id);
+       /* XXX only do global rename lock for migration */
+       if (mdt_seq_site(info->mti_mdt)->ss_node_id != 0 &&
+           rename_lock == MRL_MIGRATE) {
+               struct lu_fid *fid = &info->mti_tmp_fid1;
+               struct mdt_object *obj;
+
+               /* XXX, right now, it has to use object API to
+                * enqueue lock cross MDT, so it will enqueue
+                * rename lock(with LUSTRE_BFL_FID) by root object */
+               lu_root_fid(fid);
+               obj = mdt_object_find(info->mti_env, info->mti_mdt, fid);
+               if (IS_ERR(obj))
+                       RETURN(PTR_ERR(obj));
+
+               LASSERT(mdt_object_remote(obj));
+               rc = mdt_remote_object_lock(info, obj,
+                                           &LUSTRE_BFL_FID, lh,
+                                           LCK_EX,
+                                           MDS_INODELOCK_UPDATE);
+               mdt_object_put(info->mti_env, obj);
+       } else {
+               fid_build_reg_res_name(&LUSTRE_BFL_FID, res_id);
+               memset(policy, 0, sizeof *policy);
+               policy->l_inodebits.bits = MDS_INODELOCK_UPDATE;
+               flags = LDLM_FL_LOCAL_ONLY | LDLM_FL_ATOMIC_CB;
+               rc = ldlm_cli_enqueue_local(ns, res_id, LDLM_IBITS, policy,
+                                           LCK_EX, &flags, ldlm_blocking_ast,
+                                           ldlm_completion_ast, NULL, NULL, 0,
+                                           LVB_T_NONE,
+                                           &info->mti_exp->exp_handle.h_cookie,
+                                           lh);
+       }
 
-       memset(policy, 0, sizeof *policy);
-       policy->l_inodebits.bits = MDS_INODELOCK_UPDATE;
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 4, 53, 0)
-       /* In phase I, we will not do cross-rename, so local BFL lock would
-        * be enough
-        */
-       flags = LDLM_FL_LOCAL_ONLY | LDLM_FL_ATOMIC_CB;
-       /*
-        * Current node is controller, that is mdt0, where we should
-        * take BFL lock.
-        */
-       rc = ldlm_cli_enqueue_local(ns, res_id, LDLM_IBITS, policy,
-                                   LCK_EX, &flags, ldlm_blocking_ast,
-                                   ldlm_completion_ast, NULL, NULL, 0,
-                                   LVB_T_NONE,
-                                   &info->mti_exp->exp_handle.h_cookie,
-                                   lh);
-#else
-#warning "Local rename lock is invalid for DNE phase II."
-#endif
-        RETURN(rc);
+       RETURN(rc);
 }
 
 static void mdt_rename_unlock(struct lustre_handle *lh)
 {
-        ENTRY;
-        LASSERT(lustre_handle_is_used(lh));
-        ldlm_lock_decref(lh, LCK_EX);
-        EXIT;
+       ENTRY;
+       LASSERT(lustre_handle_is_used(lh));
+       /* Cancel the single rename lock right away */
+       ldlm_lock_decref_and_cancel(lh, LCK_EX);
+       EXIT;
 }
 
 /*
@@ -934,277 +1263,789 @@ static void mdt_rename_unlock(struct lustre_handle *lh)
  * target. Source should not be ancestor of target dir. May be other rename
  * checks can be moved here later.
  */
-static int mdt_rename_sanity(struct mdt_thread_info *info, struct lu_fid *fid)
+static int mdt_is_subdir(struct mdt_thread_info *info,
+                        struct mdt_object *dir,
+                        const struct lu_fid *fid)
 {
-        struct mdt_reint_record *rr = &info->mti_rr;
-        struct lu_fid dst_fid = *rr->rr_fid2;
-        struct mdt_object *dst;
+       struct lu_fid dir_fid = dir->mot_header.loh_fid;
         int rc = 0;
         ENTRY;
 
-        do {
-                LASSERT(fid_is_sane(&dst_fid));
-                dst = mdt_object_find(info->mti_env, info->mti_mdt, &dst_fid);
-                if (!IS_ERR(dst)) {
-                        rc = mdo_is_subdir(info->mti_env,
-                                           mdt_object_child(dst), fid,
-                                           &dst_fid);
-                        mdt_object_put(info->mti_env, dst);
-                        if (rc != -EREMOTE && rc < 0) {
-                                CERROR("Failed mdo_is_subdir(), rc %d\n", rc);
-                        } else {
-                                /* check the found fid */
-                                if (lu_fid_eq(&dst_fid, fid))
-                                        rc = -EINVAL;
-                        }
-                } else {
-                        rc = PTR_ERR(dst);
-                }
-        } while (rc == -EREMOTE);
+       /* If the source and target are in the same directory, they can not
+        * be parent/child relationship, so subdir check is not needed */
+       if (lu_fid_eq(&dir_fid, fid))
+               return 0;
+
+       if (!mdt_object_exists(dir))
+               RETURN(-ENOENT);
+
+       rc = mdo_is_subdir(info->mti_env, mdt_object_child(dir),
+                          fid, &dir_fid);
+       if (rc < 0) {
+               CERROR("%s: failed subdir check in "DFID" for "DFID
+                      ": rc = %d\n", mdt_obd_name(info->mti_mdt),
+                      PFID(&dir_fid), PFID(fid), rc);
+               /* Return EINVAL only if a parent is the @fid */
+               if (rc == -EINVAL)
+                       rc = -EIO;
+       } else {
+               /* check the found fid */
+               if (lu_fid_eq(&dir_fid, fid))
+                       rc = -EINVAL;
+       }
 
         RETURN(rc);
 }
 
-/*
- * VBR: rename versions in reply: 0 - src parent; 1 - tgt parent;
- * 2 - src child; 3 - tgt child.
- * Update on disk version of src child.
- */
-static int mdt_reint_rename(struct mdt_thread_info *info,
-                            struct mdt_lock_handle *lhc)
+/* Update object linkEA */
+struct mdt_lock_list {
+       struct mdt_object       *mll_obj;
+       struct mdt_lock_handle  mll_lh;
+       struct list_head        mll_list;
+};
+
+static void mdt_unlock_list(struct mdt_thread_info *info,
+                           struct list_head *list, int rc)
 {
-        struct mdt_reint_record *rr = &info->mti_rr;
-        struct md_attr          *ma = &info->mti_attr;
-        struct ptlrpc_request   *req = mdt_info_req(info);
-        struct mdt_object       *msrcdir;
-        struct mdt_object       *mtgtdir;
-        struct mdt_object       *mold;
-        struct mdt_object       *mnew = NULL;
-        struct mdt_lock_handle  *lh_srcdirp;
-        struct mdt_lock_handle  *lh_tgtdirp;
-        struct mdt_lock_handle  *lh_oldp;
-        struct mdt_lock_handle  *lh_newp;
-        struct lu_fid           *old_fid = &info->mti_tmp_fid1;
-        struct lu_fid           *new_fid = &info->mti_tmp_fid2;
-        struct lustre_handle     rename_lh = { 0 };
-        struct lu_name           slname = { 0 };
-        struct lu_name          *lname;
-        int                      rc;
-        ENTRY;
+       struct mdt_lock_list *mll;
+       struct mdt_lock_list *mll2;
 
-        if (info->mti_dlm_req)
-                ldlm_request_cancel(req, info->mti_dlm_req, 0);
+       list_for_each_entry_safe(mll, mll2, list, mll_list) {
+               mdt_object_unlock_put(info, mll->mll_obj, &mll->mll_lh, rc);
+               list_del(&mll->mll_list);
+               OBD_FREE_PTR(mll);
+       }
+}
 
-        DEBUG_REQ(D_INODE, req, "rename "DFID"/%s to "DFID"/%s",
-                  PFID(rr->rr_fid1), rr->rr_name,
-                  PFID(rr->rr_fid2), rr->rr_tgt);
+static int mdt_lock_objects_in_linkea(struct mdt_thread_info *info,
+                                     struct mdt_object *obj,
+                                     struct mdt_object *pobj,
+                                     struct list_head *lock_list)
+{
+       struct lu_buf           *buf = &info->mti_big_buf;
+       struct linkea_data      ldata = { NULL };
+       int                     count;
+       int                     rc;
+       ENTRY;
 
-       rc = mdt_rename_lock(info, &rename_lh);
-       if (rc) {
-               CERROR("Can't lock FS for rename, rc %d\n", rc);
+       if (S_ISDIR(lu_object_attr(&obj->mot_obj)))
+               RETURN(0);
+
+       buf = lu_buf_check_and_alloc(buf, PATH_MAX);
+       if (buf->lb_buf == NULL)
+               RETURN(-ENOMEM);
+
+       ldata.ld_buf = buf;
+       rc = mdt_links_read(info, obj, &ldata);
+       if (rc != 0) {
+               if (rc == -ENOENT || rc == -ENODATA)
+                       rc = 0;
                RETURN(rc);
        }
 
-        lh_newp = &info->mti_lh[MDT_LH_NEW];
+       LASSERT(ldata.ld_leh != NULL);
+       ldata.ld_lee = (struct link_ea_entry *)(ldata.ld_leh + 1);
+       for (count = 0; count < ldata.ld_leh->leh_reccount; count++) {
+               struct mdt_device *mdt = info->mti_mdt;
+               struct mdt_object *mdt_pobj;
+               struct mdt_lock_list *mll;
+               struct lu_name name;
+               struct lu_fid  fid;
+
+               linkea_entry_unpack(ldata.ld_lee, &ldata.ld_reclen,
+                                   &name, &fid);
+               ldata.ld_lee = (struct link_ea_entry *)((char *)ldata.ld_lee +
+                                                        ldata.ld_reclen);
+               mdt_pobj = mdt_object_find(info->mti_env, mdt, &fid);
+               if (IS_ERR(mdt_pobj)) {
+                       CWARN("%s: cannot find obj "DFID": rc = %ld\n",
+                             mdt_obd_name(mdt), PFID(&fid), PTR_ERR(mdt_pobj));
+                       continue;
+               }
 
-        /* step 1: lock the source dir. */
-        lh_srcdirp = &info->mti_lh[MDT_LH_PARENT];
-        mdt_lock_pdo_init(lh_srcdirp, LCK_PW, rr->rr_name,
-                          rr->rr_namelen);
-        msrcdir = mdt_object_find_lock(info, rr->rr_fid1, lh_srcdirp,
-                                       MDS_INODELOCK_UPDATE);
-        if (IS_ERR(msrcdir))
-                GOTO(out_rename_lock, rc = PTR_ERR(msrcdir));
+               if (!mdt_object_exists(mdt_pobj)) {
+                       CDEBUG(D_INFO, "%s: obj "DFID" does not exist\n",
+                             mdt_obd_name(mdt), PFID(&fid));
+                       mdt_object_put(info->mti_env, mdt_pobj);
+                       continue;
+               }
 
-        if (mdt_object_obf(msrcdir))
-                GOTO(out_unlock_source, rc = -EPERM);
+               if (mdt_pobj == pobj) {
+                       CDEBUG(D_INFO, "%s: skipping parent obj "DFID"\n",
+                              mdt_obd_name(mdt), PFID(&fid));
+                       mdt_object_put(info->mti_env, mdt_pobj);
+                       continue;
+               }
 
-        rc = mdt_version_get_check_save(info, msrcdir, 0);
-        if (rc)
-                GOTO(out_unlock_source, rc);
-
-        /* step 2: find & lock the target dir. */
-        lh_tgtdirp = &info->mti_lh[MDT_LH_CHILD];
-        mdt_lock_pdo_init(lh_tgtdirp, LCK_PW, rr->rr_tgt,
-                          rr->rr_tgtlen);
-        if (lu_fid_eq(rr->rr_fid1, rr->rr_fid2)) {
-                mdt_object_get(info->mti_env, msrcdir);
-                mtgtdir = msrcdir;
-                if (lh_tgtdirp->mlh_pdo_hash != lh_srcdirp->mlh_pdo_hash) {
-                         rc = mdt_pdir_hash_lock(info, lh_tgtdirp, mtgtdir,
-                                                 MDS_INODELOCK_UPDATE);
-                         if (rc)
-                                 GOTO(out_unlock_source, rc);
-                         OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_PDO_LOCK2, 10);
-                }
-        } else {
-                mtgtdir = mdt_object_find(info->mti_env, info->mti_mdt,
-                                          rr->rr_fid2);
-                if (IS_ERR(mtgtdir))
-                        GOTO(out_unlock_source, rc = PTR_ERR(mtgtdir));
+               OBD_ALLOC_PTR(mll);
+               if (mll == NULL) {
+                       mdt_object_put(info->mti_env, mdt_pobj);
+                       GOTO(out, rc = -ENOMEM);
+               }
 
-                if (mdt_object_obf(mtgtdir))
-                        GOTO(out_put_target, rc = -EPERM);
+               mdt_lock_pdo_init(&mll->mll_lh, LCK_PW, &name);
+               rc = mdt_object_lock(info, mdt_pobj, &mll->mll_lh,
+                                    MDS_INODELOCK_UPDATE,
+                                    MDT_CROSS_LOCK);
+               if (rc != 0) {
+                       CERROR("%s: cannot lock "DFID": rc =%d\n",
+                              mdt_obd_name(mdt), PFID(&fid), rc);
+                       mdt_object_put(info->mti_env, mdt_pobj);
+                       OBD_FREE_PTR(mll);
+                       GOTO(out, rc);
+               }
 
-                /* check early, the real version will be saved after locking */
-                rc = mdt_version_get_check(info, mtgtdir, 1);
-                if (rc)
-                        GOTO(out_put_target, rc);
-
-                rc = mdt_object_exists(mtgtdir);
-                if (rc == 0) {
-                        GOTO(out_put_target, rc = -ESTALE);
-                } else if (rc > 0) {
-                        /* we lock the target dir if it is local */
-                        rc = mdt_object_lock(info, mtgtdir, lh_tgtdirp,
-                                             MDS_INODELOCK_UPDATE,
-                                             MDT_LOCAL_LOCK);
-                        if (rc != 0)
-                                GOTO(out_put_target, rc);
-                        /* get and save correct version after locking */
-                        mdt_version_get_save(info, mtgtdir, 1);
-                }
-        }
+               INIT_LIST_HEAD(&mll->mll_list);
+               mll->mll_obj = mdt_pobj;
+               list_add_tail(&mll->mll_list, lock_list);
+       }
+out:
+       if (rc != 0)
+               mdt_unlock_list(info, lock_list, rc);
+       RETURN(rc);
+}
 
-        /* step 3: find & lock the old object. */
-        lname = mdt_name(info->mti_env, (char *)rr->rr_name, rr->rr_namelen);
-        mdt_name_copy(&slname, lname);
-        fid_zero(old_fid);
-        rc = mdt_lookup_version_check(info, msrcdir, &slname, old_fid, 2);
-        if (rc != 0)
-                GOTO(out_unlock_target, rc);
+/* migrate files from one MDT to another MDT */
+static int mdt_reint_migrate_internal(struct mdt_thread_info *info,
+                                     struct mdt_lock_handle *lhc)
+{
+       struct mdt_reint_record *rr = &info->mti_rr;
+       struct md_attr          *ma = &info->mti_attr;
+       struct mdt_object       *msrcdir;
+       struct mdt_object       *mold;
+       struct mdt_object       *mnew = NULL;
+       struct mdt_lock_handle  *lh_dirp;
+       struct mdt_lock_handle  *lh_childp;
+       struct mdt_lock_handle  *lh_tgtp = NULL;
+       struct lu_fid           *old_fid = &info->mti_tmp_fid1;
+       struct list_head        lock_list;
+       int                     rc;
+       ENTRY;
 
-        if (lu_fid_eq(old_fid, rr->rr_fid1) || lu_fid_eq(old_fid, rr->rr_fid2))
-                GOTO(out_unlock_target, rc = -EINVAL);
+       CDEBUG(D_INODE, "migrate "DFID"/"DNAME" to "DFID"\n", PFID(rr->rr_fid1),
+              PNAME(&rr->rr_name), PFID(rr->rr_fid2));
 
-        mold = mdt_object_find(info->mti_env, info->mti_mdt, old_fid);
-        if (IS_ERR(mold))
-                GOTO(out_unlock_target, rc = PTR_ERR(mold));
+       /* 1: lock the source dir. */
+       msrcdir = mdt_object_find(info->mti_env, info->mti_mdt, rr->rr_fid1);
+       if (IS_ERR(msrcdir)) {
+               CERROR("%s: cannot find source dir "DFID" : rc = %d\n",
+                       mdt_obd_name(info->mti_mdt), PFID(rr->rr_fid1),
+                       (int)PTR_ERR(msrcdir));
+               RETURN(PTR_ERR(msrcdir));
+       }
+
+       lh_dirp = &info->mti_lh[MDT_LH_PARENT];
+       mdt_lock_pdo_init(lh_dirp, LCK_PW, &rr->rr_name);
+       rc = mdt_object_lock(info, msrcdir, lh_dirp,
+                            MDS_INODELOCK_UPDATE,
+                            MDT_CROSS_LOCK);
+       if (rc)
+               GOTO(out_put_parent, rc);
 
-       if (mdt_object_obf(mold)) {
-               mdt_object_put(info->mti_env, mold);
-               GOTO(out_unlock_target, rc = -EPERM);
+       if (!mdt_object_remote(msrcdir)) {
+               rc = mdt_version_get_check_save(info, msrcdir, 0);
+               if (rc)
+                       GOTO(out_unlock_parent, rc);
        }
 
-        lh_oldp = &info->mti_lh[MDT_LH_OLD];
-        mdt_lock_reg_init(lh_oldp, LCK_EX);
-        rc = mdt_object_lock(info, mold, lh_oldp, MDS_INODELOCK_LOOKUP,
-                             MDT_CROSS_LOCK);
-        if (rc != 0) {
-                mdt_object_put(info->mti_env, mold);
-                GOTO(out_unlock_target, rc);
-        }
+       /* 2: sanity check and find the object to be migrated. */
+       fid_zero(old_fid);
+       rc = mdt_lookup_version_check(info, msrcdir, &rr->rr_name, old_fid, 2);
+       if (rc != 0)
+               GOTO(out_unlock_parent, rc);
 
-        info->mti_mos = mold;
-        /* save version after locking */
-        mdt_version_get_save(info, mold, 2);
-        mdt_set_capainfo(info, 2, old_fid, BYPASS_CAPA);
-
-        /* step 4: find & lock the new object. */
-        /* new target object may not exist now */
-        lname = mdt_name(info->mti_env, (char *)rr->rr_tgt, rr->rr_tgtlen);
-        /* lookup with version checking */
-        fid_zero(new_fid);
-        rc = mdt_lookup_version_check(info, mtgtdir, lname, new_fid, 3);
-        if (rc == 0) {
-                /* the new_fid should have been filled at this moment */
-                if (lu_fid_eq(old_fid, new_fid))
-                       GOTO(out_unlock_old, rc);
-
-                if (lu_fid_eq(new_fid, rr->rr_fid1) ||
-                    lu_fid_eq(new_fid, rr->rr_fid2))
-                        GOTO(out_unlock_old, rc = -EINVAL);
-
-                mdt_lock_reg_init(lh_newp, LCK_EX);
-                mnew = mdt_object_find(info->mti_env, info->mti_mdt, new_fid);
-                if (IS_ERR(mnew))
-                        GOTO(out_unlock_old, rc = PTR_ERR(mnew));
-
-               if (mdt_object_obf(mnew)) {
-                       mdt_object_put(info->mti_env, mnew);
-                       GOTO(out_unlock_old, rc = -EPERM);
+       if (lu_fid_eq(old_fid, rr->rr_fid1) || lu_fid_eq(old_fid, rr->rr_fid2))
+               GOTO(out_unlock_parent, rc = -EINVAL);
+
+       if (!fid_is_md_operative(old_fid))
+               GOTO(out_unlock_parent, rc = -EPERM);
+
+       mold = mdt_object_find(info->mti_env, info->mti_mdt, old_fid);
+       if (IS_ERR(mold))
+               GOTO(out_unlock_parent, rc = PTR_ERR(mold));
+
+       if (mdt_object_remote(mold)) {
+               CERROR("%s: source "DFID" is on the remote MDT\n",
+                      mdt_obd_name(info->mti_mdt), PFID(old_fid));
+               GOTO(out_put_child, rc = -EREMOTE);
+       }
+
+       if (S_ISREG(lu_object_attr(&mold->mot_obj)) &&
+           !mdt_object_remote(msrcdir)) {
+               CERROR("%s: parent "DFID" is still on the same"
+                      " MDT, which should be migrated first:"
+                      " rc = %d\n", mdt_obd_name(info->mti_mdt),
+                      PFID(mdt_object_fid(msrcdir)), -EPERM);
+               GOTO(out_put_child, rc = -EPERM);
+       }
+
+       rc = mdt_remote_permission(info, msrcdir, mold);
+       if (rc != 0)
+               GOTO(out_put_child, rc);
+
+       /* 3: iterate the linkea of the object and lock all of the objects */
+       INIT_LIST_HEAD(&lock_list);
+       rc = mdt_lock_objects_in_linkea(info, mold, msrcdir, &lock_list);
+       if (rc != 0)
+               GOTO(out_put_child, rc);
+
+       /* 4: lock of the object migrated object */
+       lh_childp = &info->mti_lh[MDT_LH_OLD];
+       mdt_lock_reg_init(lh_childp, LCK_EX);
+       rc = mdt_object_lock(info, mold, lh_childp,
+                            MDS_INODELOCK_LOOKUP | MDS_INODELOCK_UPDATE |
+                            MDS_INODELOCK_LAYOUT, MDT_CROSS_LOCK);
+       if (rc != 0)
+               GOTO(out_unlock_list, rc);
+
+       ma->ma_need = MA_LMV;
+       ma->ma_valid = 0;
+       ma->ma_lmv = (union lmv_mds_md *)info->mti_xattr_buf;
+       ma->ma_lmv_size = sizeof(info->mti_xattr_buf);
+       rc = mdt_stripe_get(info, mold, ma, XATTR_NAME_LMV);
+       if (rc != 0)
+               GOTO(out_unlock_list, rc);
+
+       if ((ma->ma_valid & MA_LMV)) {
+               struct lmv_mds_md_v1 *lmm1;
+
+               lmv_le_to_cpu(ma->ma_lmv, ma->ma_lmv);
+               lmm1 = &ma->ma_lmv->lmv_md_v1;
+               if (!(lmm1->lmv_hash_type & LMV_HASH_FLAG_MIGRATION)) {
+                       CERROR("%s: can not migrate striped dir "DFID
+                              ": rc = %d\n", mdt_obd_name(info->mti_mdt),
+                              PFID(mdt_object_fid(mold)), -EPERM);
+                       GOTO(out_unlock_child, rc = -EPERM);
                }
 
-                rc = mdt_object_lock(info, mnew, lh_newp,
-                                     MDS_INODELOCK_FULL, MDT_CROSS_LOCK);
-                if (rc != 0) {
-                        mdt_object_put(info->mti_env, mnew);
-                        GOTO(out_unlock_old, rc);
-                }
-                /* get and save version after locking */
-                mdt_version_get_save(info, mnew, 3);
-                mdt_set_capainfo(info, 3, new_fid, BYPASS_CAPA);
-        } else if (rc != -EREMOTE && rc != -ENOENT) {
-                GOTO(out_unlock_old, rc);
-        } else {
-                mdt_enoent_version_save(info, 3);
-        }
+               if (!fid_is_sane(&lmm1->lmv_stripe_fids[1]))
+                       GOTO(out_unlock_child, rc = -EINVAL);
 
-        /* step 5: rename it */
-        mdt_reint_init_ma(info, ma);
+               mnew = mdt_object_find(info->mti_env, info->mti_mdt,
+                                      &lmm1->lmv_stripe_fids[1]);
+               if (IS_ERR(mnew))
+                       GOTO(out_unlock_child, rc = PTR_ERR(mnew));
 
-        mdt_fail_write(info->mti_env, info->mti_mdt->mdt_bottom,
-                       OBD_FAIL_MDS_REINT_RENAME_WRITE);
+               if (!mdt_object_remote(mnew)) {
+                       CERROR("%s: "DFID" being migrated is on this MDT:"
+                              " rc  = %d\n", mdt_obd_name(info->mti_mdt),
+                              PFID(rr->rr_fid2), -EPERM);
+                       GOTO(out_put_new, rc = -EPERM);
+               }
 
+               lh_tgtp = &info->mti_lh[MDT_LH_CHILD];
+               mdt_lock_reg_init(lh_tgtp, LCK_EX);
+               rc = mdt_remote_object_lock(info, mnew,
+                                           mdt_object_fid(mnew),
+                                           &lh_tgtp->mlh_rreg_lh,
+                                           lh_tgtp->mlh_rreg_mode,
+                                           MDS_INODELOCK_UPDATE);
+               if (rc != 0) {
+                       lh_tgtp = NULL;
+                       GOTO(out_put_new, rc);
+               }
+       } else {
+               mnew = mdt_object_find(info->mti_env, info->mti_mdt,
+                                      rr->rr_fid2);
+               if (IS_ERR(mnew))
+                       GOTO(out_unlock_child, rc = PTR_ERR(mnew));
+               if (!mdt_object_remote(mnew)) {
+                       CERROR("%s: Migration "DFID" is on this MDT:"
+                              " rc = %d\n", mdt_obd_name(info->mti_mdt),
+                              PFID(rr->rr_fid2), -EXDEV);
+                       GOTO(out_put_new, rc = -EXDEV);
+               }
+       }
 
-        /* Check if @dst is subdir of @src. */
-        rc = mdt_rename_sanity(info, old_fid);
-        if (rc)
-                GOTO(out_unlock_new, rc);
+       /* 5: migrate it */
+       mdt_reint_init_ma(info, ma);
 
-        rc = mdo_rename(info->mti_env, mdt_object_child(msrcdir),
-                        mdt_object_child(mtgtdir), old_fid, &slname,
-                        (mnew ? mdt_object_child(mnew) : NULL),
-                        lname, ma);
+       mdt_fail_write(info->mti_env, info->mti_mdt->mdt_bottom,
+                      OBD_FAIL_MDS_REINT_RENAME_WRITE);
 
-        /* handle last link of tgt object */
-        if (rc == 0) {
+       rc = mdo_migrate(info->mti_env, mdt_object_child(msrcdir),
+                        mdt_object_child(mold), &rr->rr_name,
+                        mdt_object_child(mnew), ma);
+       if (rc != 0)
+               GOTO(out_unlock_new, rc);
+out_unlock_new:
+       if (lh_tgtp != NULL)
+               mdt_object_unlock(info, mnew, lh_tgtp, rc);
+out_put_new:
+       if (mnew)
+               mdt_object_put(info->mti_env, mnew);
+out_unlock_child:
+       mdt_object_unlock(info, mold, lh_childp, rc);
+out_unlock_list:
+       mdt_unlock_list(info, &lock_list, rc);
+out_put_child:
+       mdt_object_put(info->mti_env, mold);
+out_unlock_parent:
+       mdt_object_unlock(info, msrcdir, lh_dirp, rc);
+out_put_parent:
+       mdt_object_put(info->mti_env, msrcdir);
+
+       RETURN(rc);
+}
+
+static struct mdt_object *mdt_object_find_check(struct mdt_thread_info *info,
+                                               const struct lu_fid *fid,
+                                               int idx)
+{
+       struct mdt_object *dir;
+       int rc;
+       ENTRY;
+
+       dir = mdt_object_find(info->mti_env, info->mti_mdt, fid);
+       if (IS_ERR(dir))
+               RETURN(dir);
+
+       /* check early, the real version will be saved after locking */
+       rc = mdt_version_get_check(info, dir, idx);
+       if (rc)
+               GOTO(out_put, rc);
+
+       RETURN(dir);
+out_put:
+       mdt_object_put(info->mti_env, dir);
+       return ERR_PTR(rc);
+}
+
+static int mdt_object_lock_save(struct mdt_thread_info *info,
+                               struct mdt_object *dir,
+                               struct mdt_lock_handle *lh,
+                               int idx)
+{
+       int rc;
+
+       /* we lock the target dir if it is local */
+       rc = mdt_object_lock(info, dir, lh, MDS_INODELOCK_UPDATE,
+                            MDT_LOCAL_LOCK);
+       if (rc != 0)
+               return rc;
+
+       /* get and save correct version after locking */
+       mdt_version_get_save(info, dir, idx);
+       return 0;
+}
+
+
+static int mdt_rename_parents_lock(struct mdt_thread_info *info,
+                                  struct mdt_object **srcp,
+                                  struct mdt_object **tgtp)
+{
+       struct mdt_reint_record *rr = &info->mti_rr;
+       const struct lu_fid     *fid_src = rr->rr_fid1;
+       const struct lu_fid     *fid_tgt = rr->rr_fid2;
+       struct mdt_lock_handle  *lh_src = &info->mti_lh[MDT_LH_PARENT];
+       struct mdt_lock_handle  *lh_tgt = &info->mti_lh[MDT_LH_CHILD];
+       struct mdt_object       *src;
+       struct mdt_object       *tgt;
+       int                      reverse = 0;
+       int                      rc;
+       ENTRY;
+
+       /* find both parents. */
+       src = mdt_object_find_check(info, fid_src, 0);
+       if (IS_ERR(src))
+               RETURN(PTR_ERR(src));
+
+       OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_RENAME3, 5);
+
+       if (lu_fid_eq(fid_src, fid_tgt)) {
+               tgt = src;
+               mdt_object_get(info->mti_env, tgt);
+       } else {
+               /* Check if the @src is not a child of the @tgt, otherwise a
+                * reverse locking must take place. */
+               rc = mdt_is_subdir(info, src, fid_tgt);
+               if (rc == -EINVAL)
+                       reverse = 1;
+               else if (rc)
+                       GOTO(err_src_put, rc);
+
+               tgt = mdt_object_find_check(info, fid_tgt, 1);
+               if (IS_ERR(tgt))
+                       GOTO(err_src_put, rc = PTR_ERR(tgt));
+
+               if (unlikely(mdt_object_remote(tgt))) {
+                       CDEBUG(D_INFO, "Source dir "DFID" target dir "DFID
+                              "on different MDTs\n", PFID(fid_src),
+                              PFID(fid_tgt));
+                       GOTO(err_tgt_put, rc = -EXDEV);
+               }
+       }
+
+       OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_RENAME4, 5);
+
+       /* lock parents in the proper order. */
+       if (reverse) {
+               rc = mdt_object_lock_save(info, tgt, lh_tgt, 1);
+               if (rc)
+                       GOTO(err_tgt_put, rc);
+
+               OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_RENAME, 5);
+
+               rc = mdt_object_lock_save(info, src, lh_src, 0);
+       } else {
+               rc = mdt_object_lock_save(info, src, lh_src, 0);
+               if (rc)
+                       GOTO(err_tgt_put, rc);
+
+               OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_RENAME, 5);
+
+               if (tgt != src)
+                       rc = mdt_object_lock_save(info, tgt, lh_tgt, 1);
+               else if (lh_src->mlh_pdo_hash != lh_tgt->mlh_pdo_hash) {
+                       rc = mdt_pdir_hash_lock(info, lh_tgt, tgt,
+                                               MDS_INODELOCK_UPDATE);
+                       OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_PDO_LOCK2, 10);
+               }
+       }
+       if (rc)
+               GOTO(err_unlock, rc);
+
+       OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_RENAME4, 5);
+
+       *srcp = src;
+       *tgtp = tgt;
+       RETURN(0);
+
+err_unlock:
+       /* The order does not matter as the handle is checked inside,
+        * as well as not used handle. */
+       mdt_object_unlock(info, src, lh_src, rc);
+       mdt_object_unlock(info, tgt, lh_tgt, rc);
+err_tgt_put:
+       mdt_object_put(info->mti_env, tgt);
+err_src_put:
+       mdt_object_put(info->mti_env, src);
+       RETURN(rc);
+}
+
+/*
+ * VBR: rename versions in reply: 0 - src parent; 1 - tgt parent;
+ * 2 - src child; 3 - tgt child.
+ * Update on disk version of src child.
+ */
+/**
+ * For DNE phase I, only these renames are allowed
+ *     mv src_p/src_c tgt_p/tgt_c
+ * 1. src_p/src_c/tgt_p/tgt_c are in the same MDT.
+ * 2. src_p and tgt_p are same directory, and tgt_c does not
+ *    exists. In this case, all of modification will happen
+ *    in the MDT where ithesource parent is, only one remote
+ *    update is needed, i.e. set c_time/m_time on the child.
+ *    And tgt_c will be still in the same MDT as the original
+ *    src_c.
+ */
+static int mdt_reint_rename_internal(struct mdt_thread_info *info,
+                                    struct mdt_lock_handle *lhc)
+{
+       struct mdt_reint_record *rr = &info->mti_rr;
+       struct md_attr          *ma = &info->mti_attr;
+       struct ptlrpc_request   *req = mdt_info_req(info);
+       struct mdt_object       *msrcdir = NULL;
+       struct mdt_object       *mtgtdir = NULL;
+       struct mdt_object       *mold;
+       struct mdt_object       *mnew = NULL;
+       struct mdt_lock_handle  *lh_srcdirp;
+       struct mdt_lock_handle  *lh_tgtdirp;
+       struct mdt_lock_handle  *lh_oldp = NULL;
+       struct mdt_lock_handle  *lh_newp = NULL;
+       struct lu_fid           *old_fid = &info->mti_tmp_fid1;
+       struct lu_fid           *new_fid = &info->mti_tmp_fid2;
+       int                      rc;
+       ENTRY;
+
+       DEBUG_REQ(D_INODE, req, "rename "DFID"/"DNAME" to "DFID"/"DNAME,
+                 PFID(rr->rr_fid1), PNAME(&rr->rr_name),
+                 PFID(rr->rr_fid2), PNAME(&rr->rr_tgt_name));
+
+       lh_srcdirp = &info->mti_lh[MDT_LH_PARENT];
+       mdt_lock_pdo_init(lh_srcdirp, LCK_PW, &rr->rr_name);
+       lh_tgtdirp = &info->mti_lh[MDT_LH_CHILD];
+       mdt_lock_pdo_init(lh_tgtdirp, LCK_PW, &rr->rr_tgt_name);
+
+       /* step 1&2: lock the source and target dirs. */
+       rc = mdt_rename_parents_lock(info, &msrcdir, &mtgtdir);
+       if (rc)
+               RETURN(rc);
+
+       OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_RENAME2, 5);
+
+       /* step 3: find & lock the old object. */
+       fid_zero(old_fid);
+       rc = mdt_lookup_version_check(info, msrcdir, &rr->rr_name, old_fid, 2);
+       if (rc != 0)
+               GOTO(out_unlock_parents, rc);
+
+       if (lu_fid_eq(old_fid, rr->rr_fid1) || lu_fid_eq(old_fid, rr->rr_fid2))
+               GOTO(out_unlock_parents, rc = -EINVAL);
+
+       if (!fid_is_md_operative(old_fid))
+               GOTO(out_unlock_parents, rc = -EPERM);
+
+       mold = mdt_object_find(info->mti_env, info->mti_mdt, old_fid);
+       if (IS_ERR(mold))
+               GOTO(out_unlock_parents, rc = PTR_ERR(mold));
+
+       /* Check if @mtgtdir is subdir of @mold, before locking child
+        * to avoid reverse locking. */
+       rc = mdt_is_subdir(info, mtgtdir, old_fid);
+       if (rc)
+               GOTO(out_put_old, rc);
+
+       tgt_vbr_obj_set(info->mti_env, mdt_obj2dt(mold));
+       /* save version after locking */
+       mdt_version_get_save(info, mold, 2);
+       mdt_set_capainfo(info, 2, old_fid, BYPASS_CAPA);
+
+       /* step 4: find & lock the new object. */
+       /* new target object may not exist now */
+       /* lookup with version checking */
+       fid_zero(new_fid);
+       rc = mdt_lookup_version_check(info, mtgtdir, &rr->rr_tgt_name, new_fid,
+                                     3);
+       if (rc == 0) {
+               /* the new_fid should have been filled at this moment */
+               if (lu_fid_eq(old_fid, new_fid))
+                       GOTO(out_put_old, rc);
+
+               if (lu_fid_eq(new_fid, rr->rr_fid1) ||
+                   lu_fid_eq(new_fid, rr->rr_fid2))
+                       GOTO(out_put_old, rc = -EINVAL);
+
+               if (!fid_is_md_operative(new_fid))
+                       GOTO(out_put_old, rc = -EPERM);
+
+               if (mdt_object_remote(mold)) {
+                       CDEBUG(D_INFO, "Src child "DFID" is on another MDT\n",
+                              PFID(old_fid));
+                       GOTO(out_put_old, rc = -EXDEV);
+               }
+
+               mnew = mdt_object_find(info->mti_env, info->mti_mdt, new_fid);
+               if (IS_ERR(mnew))
+                       GOTO(out_put_old, rc = PTR_ERR(mnew));
+
+               if (mdt_object_remote(mnew)) {
+                       CDEBUG(D_INFO, "src child "DFID" is on another MDT\n",
+                              PFID(new_fid));
+                       GOTO(out_put_new, rc = -EXDEV);
+               }
+
+               /* Before locking the target dir, check we do not replace
+                * a dir with a non-dir, otherwise it may deadlock with
+                * link op which tries to create a link in this dir
+                * back to this non-dir. */
+               if (S_ISDIR(lu_object_attr(&mnew->mot_obj)) &&
+                   !S_ISDIR(lu_object_attr(&mold->mot_obj)))
+                       GOTO(out_put_new, rc = -EISDIR);
+
+               lh_oldp = &info->mti_lh[MDT_LH_OLD];
+               mdt_lock_reg_init(lh_oldp, LCK_EX);
+               rc = mdt_object_lock(info, mold, lh_oldp, MDS_INODELOCK_LOOKUP |
+                                    MDS_INODELOCK_XATTR, MDT_CROSS_LOCK);
+               if (rc != 0)
+                       GOTO(out_put_new, rc);
+
+               /* Check if @msrcdir is subdir of @mnew, before locking child
+                * to avoid reverse locking. */
+               rc = mdt_is_subdir(info, msrcdir, new_fid);
+               if (rc)
+                       GOTO(out_unlock_old, rc);
+
+               /* We used to acquire MDS_INODELOCK_FULL here but we
+                * can't do this now because a running HSM restore on
+                * the rename onto victim will hold the layout
+                * lock. See LU-4002. */
+
+               lh_newp = &info->mti_lh[MDT_LH_NEW];
+               mdt_lock_reg_init(lh_newp, LCK_EX);
+               rc = mdt_object_lock(info, mnew, lh_newp,
+                                    MDS_INODELOCK_LOOKUP |
+                                    MDS_INODELOCK_UPDATE,
+                                    MDT_LOCAL_LOCK);
+               if (rc != 0)
+                       GOTO(out_unlock_old, rc);
+
+               /* get and save version after locking */
+               mdt_version_get_save(info, mnew, 3);
+               mdt_set_capainfo(info, 3, new_fid, BYPASS_CAPA);
+       } else if (rc != -EREMOTE && rc != -ENOENT) {
+               GOTO(out_put_old, rc);
+       } else {
+               /* If mnew does not exist and mold are remote directory,
+                * it only allows rename if they are under same directory */
+               if (mtgtdir != msrcdir && mdt_object_remote(mold)) {
+                       CDEBUG(D_INFO, "Src child "DFID" is on another MDT\n",
+                              PFID(old_fid));
+                       GOTO(out_put_old, rc = -EXDEV);
+               }
+
+               lh_oldp = &info->mti_lh[MDT_LH_OLD];
+               mdt_lock_reg_init(lh_oldp, LCK_EX);
+               rc = mdt_object_lock(info, mold, lh_oldp, MDS_INODELOCK_LOOKUP |
+                                    MDS_INODELOCK_XATTR, MDT_CROSS_LOCK);
+               if (rc != 0)
+                       GOTO(out_put_old, rc);
+
+               mdt_enoent_version_save(info, 3);
+       }
+
+       /* step 5: rename it */
+       mdt_reint_init_ma(info, ma);
+
+       mdt_fail_write(info->mti_env, info->mti_mdt->mdt_bottom,
+                      OBD_FAIL_MDS_REINT_RENAME_WRITE);
+
+       if (mnew != NULL)
+               mutex_lock(&mnew->mot_lov_mutex);
+
+       rc = mdo_rename(info->mti_env, mdt_object_child(msrcdir),
+                       mdt_object_child(mtgtdir), old_fid, &rr->rr_name,
+                       mnew != NULL ? mdt_object_child(mnew) : NULL,
+                       &rr->rr_tgt_name, ma);
+
+       if (mnew != NULL)
+               mutex_unlock(&mnew->mot_lov_mutex);
+
+       /* handle last link of tgt object */
+       if (rc == 0) {
                mdt_counter_incr(req, LPROC_MDT_RENAME);
-                if (mnew)
-                        mdt_handle_last_unlink(info, mnew, ma);
+               if (mnew)
+                       mdt_handle_last_unlink(info, mnew, ma);
 
                mdt_rename_counter_tally(info, info->mti_mdt, req,
-                                         msrcdir, mtgtdir);
-        }
+                                        msrcdir, mtgtdir);
+       }
 
-        EXIT;
-out_unlock_new:
-        if (mnew)
-                mdt_object_unlock_put(info, mnew, lh_newp, rc);
+       EXIT;
+       if (mnew != NULL)
+               mdt_object_unlock(info, mnew, lh_newp, rc);
 out_unlock_old:
-        mdt_object_unlock_put(info, mold, lh_oldp, rc);
-out_unlock_target:
-        mdt_object_unlock(info, mtgtdir, lh_tgtdirp, rc);
-out_put_target:
-        mdt_object_put(info->mti_env, mtgtdir);
-out_unlock_source:
-        mdt_object_unlock_put(info, msrcdir, lh_srcdirp, rc);
-out_rename_lock:
+       mdt_object_unlock(info, mold, lh_oldp, rc);
+out_put_new:
+       if (mnew != NULL)
+               mdt_object_put(info->mti_env, mnew);
+out_put_old:
+       mdt_object_put(info->mti_env, mold);
+out_unlock_parents:
+       mdt_object_unlock_put(info, mtgtdir, lh_tgtdirp, rc);
+       mdt_object_unlock_put(info, msrcdir, lh_srcdirp, rc);
+       return rc;
+}
+
+static int mdt_reint_rename_or_migrate(struct mdt_thread_info *info,
+                                      struct mdt_lock_handle *lhc,
+                                      enum mdt_rename_lock rename_lock)
+{
+       struct mdt_reint_record *rr = &info->mti_rr;
+       struct ptlrpc_request   *req = mdt_info_req(info);
+       struct lustre_handle    rename_lh = { 0 };
+       int                     rc;
+       ENTRY;
+
+       if (info->mti_dlm_req)
+               ldlm_request_cancel(req, info->mti_dlm_req, 0, LATF_SKIP);
+
+       if (!fid_is_md_operative(rr->rr_fid1) ||
+           !fid_is_md_operative(rr->rr_fid2))
+               RETURN(-EPERM);
+
+       rc = mdt_rename_lock(info, &rename_lh, rename_lock);
+       if (rc != 0) {
+               CERROR("%s: can't lock FS for rename: rc  = %d\n",
+                      mdt_obd_name(info->mti_mdt), rc);
+               RETURN(rc);
+       }
+
+       if (rename_lock == MRL_RENAME)
+               rc = mdt_reint_rename_internal(info, lhc);
+       else
+               rc = mdt_reint_migrate_internal(info, lhc);
+
        if (lustre_handle_is_used(&rename_lh))
                mdt_rename_unlock(&rename_lh);
-       return rc;
+
+       RETURN(rc);
+}
+
+static int mdt_reint_rename(struct mdt_thread_info *info,
+                           struct mdt_lock_handle *lhc)
+{
+       return mdt_reint_rename_or_migrate(info, lhc, MRL_RENAME);
+}
+
+static int mdt_reint_migrate(struct mdt_thread_info *info,
+                           struct mdt_lock_handle *lhc)
+{
+       return mdt_reint_rename_or_migrate(info, lhc, MRL_MIGRATE);
 }
 
-typedef int (*mdt_reinter)(struct mdt_thread_info *info,
-                           struct mdt_lock_handle *lhc);
-
-static mdt_reinter reinters[REINT_MAX] = {
-        [REINT_SETATTR]  = mdt_reint_setattr,
-        [REINT_CREATE]   = mdt_reint_create,
-        [REINT_LINK]     = mdt_reint_link,
-        [REINT_UNLINK]   = mdt_reint_unlink,
-        [REINT_RENAME]   = mdt_reint_rename,
-        [REINT_OPEN]     = mdt_reint_open,
-        [REINT_SETXATTR] = mdt_reint_setxattr
+struct mdt_reinter {
+       int (*mr_handler)(struct mdt_thread_info *, struct mdt_lock_handle *);
+       enum lprocfs_extra_opc mr_extra_opc;
+};
+
+static const struct mdt_reinter mdt_reinters[] = {
+       [REINT_SETATTR] = {
+               .mr_handler = &mdt_reint_setattr,
+               .mr_extra_opc = MDS_REINT_SETATTR,
+       },
+       [REINT_CREATE] = {
+               .mr_handler = &mdt_reint_create,
+               .mr_extra_opc = MDS_REINT_CREATE,
+       },
+       [REINT_LINK] = {
+               .mr_handler = &mdt_reint_link,
+               .mr_extra_opc = MDS_REINT_LINK,
+       },
+       [REINT_UNLINK] = {
+               .mr_handler = &mdt_reint_unlink,
+               .mr_extra_opc = MDS_REINT_UNLINK,
+       },
+       [REINT_RENAME] = {
+               .mr_handler = &mdt_reint_rename,
+               .mr_extra_opc = MDS_REINT_RENAME,
+       },
+       [REINT_OPEN] = {
+               .mr_handler = &mdt_reint_open,
+               .mr_extra_opc = MDS_REINT_OPEN,
+       },
+       [REINT_SETXATTR] = {
+               .mr_handler = &mdt_reint_setxattr,
+               .mr_extra_opc = MDS_REINT_SETXATTR,
+       },
+       [REINT_RMENTRY] = {
+               .mr_handler = &mdt_reint_unlink,
+               .mr_extra_opc = MDS_REINT_UNLINK,
+       },
+       [REINT_MIGRATE] = {
+               .mr_handler = &mdt_reint_migrate,
+               .mr_extra_opc = MDS_REINT_RENAME,
+       },
 };
 
 int mdt_reint_rec(struct mdt_thread_info *info,
-                  struct mdt_lock_handle *lhc)
+                 struct mdt_lock_handle *lhc)
 {
-        int rc;
-        ENTRY;
+       const struct mdt_reinter *mr;
+       int rc;
+       ENTRY;
 
-        rc = reinters[info->mti_rr.rr_opcode](info, lhc);
+       if (!(info->mti_rr.rr_opcode < ARRAY_SIZE(mdt_reinters)))
+               RETURN(-EPROTO);
 
-        RETURN(rc);
+       mr = &mdt_reinters[info->mti_rr.rr_opcode];
+       if (mr->mr_handler == NULL)
+               RETURN(-EPROTO);
+
+       rc = (*mr->mr_handler)(info, lhc);
+
+       lprocfs_counter_incr(ptlrpc_req2svc(mdt_info_req(info))->srv_stats,
+                            PTLRPC_LAST_CNTR + mr->mr_extra_opc);
+
+       RETURN(rc);
 }