Whamcloud - gitweb
LU-12635 build: Support for gcc -Wimplicit-fallthrough
[fs/lustre-release.git] / lustre / mdc / mdc_reint.c
index c65ec1d..07c3e05 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_MDC
 
-#ifdef __KERNEL__
-#ifndef AUTOCONF_INCLUDED
-# include <linux/config.h>
-#endif
-# include <linux/module.h>
-# include <linux/kernel.h>
-#else
-# include <liblustre.h>
-#endif
+#include <linux/module.h>
+#include <linux/kernel.h>
 
 #include <obd_class.h>
 #include "mdc_internal.h"
 #include <lustre_fid.h>
 
 /* mdc_setattr does its own semaphore handling */
-static int mdc_reint(struct ptlrpc_request *request,
-                     struct mdc_rpc_lock *rpc_lock,
-                     int level)
+static int mdc_reint(struct ptlrpc_request *request, int level)
 {
         int rc;
 
         request->rq_send_state = level;
 
-        mdc_get_rpc_lock(rpc_lock, NULL);
-        rc = ptlrpc_queue_wait(request);
-        mdc_put_rpc_lock(rpc_lock, NULL);
+       mdc_get_mod_rpc_slot(request, NULL);
+       rc = ptlrpc_queue_wait(request);
+       mdc_put_mod_rpc_slot(request, NULL);
         if (rc)
                 CDEBUG(D_INFO, "error in handling %d\n", rc);
         else if (!req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY)) {
@@ -76,46 +60,55 @@ static int mdc_reint(struct ptlrpc_request *request,
 /* Find and cancel locally locks matched by inode @bits & @mode in the resource
  * found by @fid. Found locks are added into @cancel list. Returns the amount of
  * locks added to @cancels list. */
-int mdc_resource_get_unused(struct obd_export *exp, struct lu_fid *fid,
-                            cfs_list_t *cancels, ldlm_mode_t mode,
-                            __u64 bits)
+int mdc_resource_get_unused_res(struct obd_export *exp,
+                               struct ldlm_res_id *res_id,
+                               struct list_head *cancels,
+                               enum ldlm_mode mode, __u64 bits)
 {
-        ldlm_policy_data_t policy = {{0}};
-        struct ldlm_res_id res_id;
-        struct ldlm_resource *res;
-        int count;
-        ENTRY;
-
-        fid_build_reg_res_name(fid, &res_id);
-        res = ldlm_resource_get(exp->exp_obd->obd_namespace,
-                                NULL, &res_id, 0, 0);
-        if (res == NULL)
-                RETURN(0);
-        LDLM_RESOURCE_ADDREF(res);
-        /* Initialize ibits lock policy. */
-        policy.l_inodebits.bits = bits;
-        count = ldlm_cancel_resource_local(res, cancels, &policy,
-                                           mode, 0, 0, NULL);
-        LDLM_RESOURCE_DELREF(res);
-        ldlm_resource_putref(res);
-        RETURN(count);
+       struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;
+       union ldlm_policy_data policy = { { 0 } };
+       struct ldlm_resource *res;
+       int count;
+
+       ENTRY;
+
+       /* Return, i.e. cancel nothing, only if ELC is supported (flag in
+        * export) but disabled through procfs (flag in NS).
+        *
+        * This distinguishes from a case when ELC is not supported originally,
+        * when we still want to cancel locks in advance and just cancel them
+        * locally, without sending any RPC. */
+       if (exp_connect_cancelset(exp) && !ns_connect_cancelset(ns))
+               RETURN(0);
+
+       res = ldlm_resource_get(ns, NULL, res_id, 0, 0);
+       if (IS_ERR(res))
+               RETURN(0);
+       LDLM_RESOURCE_ADDREF(res);
+       /* Initialize ibits lock policy. */
+       policy.l_inodebits.bits = bits;
+       count = ldlm_cancel_resource_local(res, cancels, &policy, mode, 0, 0,
+                                          NULL);
+       LDLM_RESOURCE_DELREF(res);
+       ldlm_resource_putref(res);
+       RETURN(count);
 }
 
-static int mdc_prep_elc_req(struct obd_export *exp, struct ptlrpc_request *req,
-                            cfs_list_t *cancels, int count)
+int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,
+                           struct list_head *cancels, enum ldlm_mode mode,
+                           __u64 bits)
 {
-        return ldlm_prep_elc_req(exp, req, LUSTRE_MDS_VERSION, MDS_REINT,
-                                 0, cancels, count);
+       struct ldlm_res_id res_id;
+
+       fid_build_reg_res_name(fid, &res_id);
+       return mdc_resource_get_unused_res(exp, &res_id, cancels, mode, bits);
 }
 
 int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
-                void *ea, int ealen, void *ea2, int ea2len,
-                struct ptlrpc_request **request, struct md_open_data **mod)
+               void *ea, size_t ealen, struct ptlrpc_request **request)
 {
-        CFS_LIST_HEAD(cancels);
+       struct list_head cancels = LIST_HEAD_INIT(cancels);
         struct ptlrpc_request *req;
-        struct mdc_rpc_lock *rpc_lock;
-        struct obd_device *obd = exp->exp_obd;
         int count = 0, rc;
         __u64 bits;
         ENTRY;
@@ -125,119 +118,70 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
         bits = MDS_INODELOCK_UPDATE;
         if (op_data->op_attr.ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID))
                 bits |= MDS_INODELOCK_LOOKUP;
-        if ((op_data->op_flags & MF_MDC_CANCEL_FID1) &&
-            (fid_is_sane(&op_data->op_fid1)) &&
-            !OBD_FAIL_CHECK(OBD_FAIL_LDLM_BL_CALLBACK))
-                count = mdc_resource_get_unused(exp, &op_data->op_fid1,
-                                                &cancels, LCK_EX, bits);
+       if ((op_data->op_flags & MF_MDC_CANCEL_FID1) &&
+           (fid_is_sane(&op_data->op_fid1)))
+               count = mdc_resource_get_unused(exp, &op_data->op_fid1,
+                                               &cancels, LCK_EX, bits);
         req = ptlrpc_request_alloc(class_exp2cliimp(exp),
                                    &RQF_MDS_REINT_SETATTR);
         if (req == NULL) {
                 ldlm_lock_list_put(&cancels, l_bl_ast, count);
                 RETURN(-ENOMEM);
         }
-        mdc_set_capa_size(req, &RMF_CAPA1, op_data->op_capa1);
-        if ((op_data->op_flags & (MF_SOM_CHANGE | MF_EPOCH_OPEN)) == 0)
-                req_capsule_set_size(&req->rq_pill, &RMF_MDT_EPOCH, RCL_CLIENT,
-                                     0);
-        req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_CLIENT, ealen);
-        req_capsule_set_size(&req->rq_pill, &RMF_LOGCOOKIES, RCL_CLIENT,
-                             ea2len);
-
-        rc = mdc_prep_elc_req(exp, req, &cancels, count);
-        if (rc) {
-                ptlrpc_request_free(req);
-                RETURN(rc);
-        }
 
-        rpc_lock = obd->u.cli.cl_rpc_lock;
+       req_capsule_set_size(&req->rq_pill, &RMF_MDT_EPOCH, RCL_CLIENT, 0);
+       req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_CLIENT, ealen);
+       req_capsule_set_size(&req->rq_pill, &RMF_LOGCOOKIES, RCL_CLIENT, 0);
+
+       rc = mdc_prep_elc_req(exp, req, MDS_REINT, &cancels, count);
+       if (rc) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
 
         if (op_data->op_attr.ia_valid & (ATTR_MTIME | ATTR_CTIME))
-                CDEBUG(D_INODE, "setting mtime "CFS_TIME_T
-                       ", ctime "CFS_TIME_T"\n",
-                       LTIME_S(op_data->op_attr.ia_mtime),
-                       LTIME_S(op_data->op_attr.ia_ctime));
-        mdc_setattr_pack(req, op_data, ea, ealen, ea2, ea2len);
+               CDEBUG(D_INODE, "setting mtime %lld, ctime %lld\n",
+                      (s64)op_data->op_attr.ia_mtime.tv_sec,
+                      (s64)op_data->op_attr.ia_ctime.tv_sec);
+       mdc_setattr_pack(req, op_data, ea, ealen);
+
+       req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER, 0);
 
         ptlrpc_request_set_replen(req);
-        if (mod && (op_data->op_flags & MF_EPOCH_OPEN) &&
-            req->rq_import->imp_replayable)
-        {
-                LASSERT(*mod == NULL);
-
-                *mod = obd_mod_alloc();
-                if (*mod == NULL) {
-                        DEBUG_REQ(D_ERROR, req, "Can't allocate "
-                                  "md_open_data");
-                } else {
-                        req->rq_replay = 1;
-                        req->rq_cb_data = *mod;
-                        (*mod)->mod_open_req = req;
-                        req->rq_commit_cb = mdc_commit_open;
-                        /**
-                         * Take an extra reference on \var mod, it protects \var
-                         * mod from being freed on eviction (commit callback is
-                         * called despite rq_replay flag).
-                         * Will be put on mdc_done_writing().
-                         */
-                        obd_mod_get(*mod);
-                }
-        }
 
-        rc = mdc_reint(req, rpc_lock, LUSTRE_IMP_FULL);
-
-        /* Save the obtained info in the original RPC for the replay case. */
-        if (rc == 0 && (op_data->op_flags & MF_EPOCH_OPEN)) {
-                struct mdt_ioepoch *epoch;
-                struct mdt_body  *body;
-
-                epoch = req_capsule_client_get(&req->rq_pill, &RMF_MDT_EPOCH);
-                body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
-                LASSERT(epoch != NULL);
-                LASSERT(body != NULL);
-                epoch->handle = body->handle;
-                epoch->ioepoch = body->ioepoch;
-                req->rq_replay_cb = mdc_replay_open;
-        /** bug 3633, open may be committed and estale answer is not error */
-        } else if (rc == -ESTALE && (op_data->op_flags & MF_SOM_CHANGE)) {
-                rc = 0;
-        } else if (rc == -ERESTARTSYS) {
+       rc = mdc_reint(req, LUSTRE_IMP_FULL);
+       if (rc == -ERESTARTSYS)
                 rc = 0;
-        }
+
         *request = req;
-        if (rc && req->rq_commit_cb) {
-                /* Put an extra reference on \var mod on error case. */
-                obd_mod_put(*mod);
-                req->rq_commit_cb(req);
-        }
-        RETURN(rc);
+
+       RETURN(rc);
 }
 
 int mdc_create(struct obd_export *exp, struct md_op_data *op_data,
-               const void *data, int datalen, int mode, __u32 uid, __u32 gid,
-               cfs_cap_t cap_effective, __u64 rdev,
-               struct ptlrpc_request **request)
+               const void *data, size_t datalen,
+               umode_t mode, uid_t uid, gid_t gid,
+               cfs_cap_t cap_effective, __u64 rdev,
+               struct ptlrpc_request **request)
 {
         struct ptlrpc_request *req;
         int level, rc;
         int count, resends = 0;
         struct obd_import *import = exp->exp_obd->u.cli.cl_import;
         int generation = import->imp_generation;
-        CFS_LIST_HEAD(cancels);
+       struct list_head cancels = LIST_HEAD_INIT(cancels);
         ENTRY;
 
-        /* For case if upper layer did not alloc fid, do it now. */
-        if (!fid_is_sane(&op_data->op_fid2)) {
-                /*
-                 * mdc_fid_alloc() may return errno 1 in case of switch to new
-                 * sequence, handle this.
-                 */
-                rc = mdc_fid_alloc(exp, &op_data->op_fid2, op_data);
-                if (rc < 0) {
-                        CERROR("Can't alloc new fid, rc %d\n", rc);
-                        RETURN(rc);
-                }
-        }
+       /* For case if upper layer did not alloc fid, do it now. */
+       if (!fid_is_sane(&op_data->op_fid2)) {
+               /*
+                * mdc_fid_alloc() may return errno 1 in case of switch to new
+                * sequence, handle this.
+                */
+               rc = mdc_fid_alloc(NULL, exp, &op_data->op_fid2, op_data);
+               if (rc < 0)
+                       RETURN(rc);
+       }
 
 rebuild:
         count = 0;
@@ -248,22 +192,39 @@ rebuild:
                                                 MDS_INODELOCK_UPDATE);
 
         req = ptlrpc_request_alloc(class_exp2cliimp(exp),
-                                   &RQF_MDS_REINT_CREATE_RMT_ACL);
+                                  &RQF_MDS_REINT_CREATE_ACL);
         if (req == NULL) {
                 ldlm_lock_list_put(&cancels, l_bl_ast, count);
                 RETURN(-ENOMEM);
         }
-        mdc_set_capa_size(req, &RMF_CAPA1, op_data->op_capa1);
+
         req_capsule_set_size(&req->rq_pill, &RMF_NAME, RCL_CLIENT,
                              op_data->op_namelen + 1);
         req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_CLIENT,
                              data && datalen ? datalen : 0);
 
-        rc = mdc_prep_elc_req(exp, req, &cancels, count);
-        if (rc) {
-                ptlrpc_request_free(req);
-                RETURN(rc);
-        }
+       req_capsule_set_size(&req->rq_pill, &RMF_FILE_SECCTX_NAME,
+                            RCL_CLIENT, op_data->op_file_secctx_name != NULL ?
+                            strlen(op_data->op_file_secctx_name) + 1 : 0);
+
+       req_capsule_set_size(&req->rq_pill, &RMF_FILE_SECCTX, RCL_CLIENT,
+                            op_data->op_file_secctx_size);
+
+       /* get SELinux policy info if any */
+       rc = sptlrpc_get_sepol(req);
+       if (rc < 0) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
+       req_capsule_set_size(&req->rq_pill, &RMF_SELINUX_POL, RCL_CLIENT,
+                            strlen(req->rq_sepol) ?
+                            strlen(req->rq_sepol) + 1 : 0);
+
+       rc = mdc_prep_elc_req(exp, req, MDS_REINT, &cancels, count);
+       if (rc) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
 
         /*
          * mdc_create_pack() fills msg->bufs[1] with name and msg->bufs[2] with
@@ -274,47 +235,41 @@ rebuild:
 
         ptlrpc_request_set_replen(req);
 
+       /* ask ptlrpc not to resend on EINPROGRESS since we have our own retry
+        * logic here */
+       req->rq_no_retry_einprogress = 1;
+
         if (resends) {
                 req->rq_generation_set = 1;
                 req->rq_import_generation = generation;
-                req->rq_sent = cfs_time_current_sec() + resends;
+               req->rq_sent = ktime_get_real_seconds() + resends;
         }
         level = LUSTRE_IMP_FULL;
  resend:
-        rc = mdc_reint(req, exp->exp_obd->u.cli.cl_rpc_lock, level);
+       rc = mdc_reint(req, level);
 
         /* Resend if we were told to. */
         if (rc == -ERESTARTSYS) {
                 level = LUSTRE_IMP_RECOVER;
                 goto resend;
         } else if (rc == -EINPROGRESS) {
-                /* Retry create infinitely until succeed or get other
-                 * error code. */
-                ptlrpc_req_finished(req);
-                resends++;
-
-                CDEBUG(D_HA, "%s: resend:%d create on "DFID"/"DFID"\n",
-                       exp->exp_obd->obd_name, resends,
-                       PFID(&op_data->op_fid1), PFID(&op_data->op_fid2));
-
-                if (generation == import->imp_generation) {
-                        goto rebuild;
+               /* Retry create infinitely until succeed or get other
+                * error code or interrupted. */
+               ptlrpc_req_finished(req);
+               if (generation == import->imp_generation) {
+                       if (signal_pending(current))
+                               RETURN(-EINTR);
+
+                       resends++;
+                       CDEBUG(D_HA, "%s: resend:%d create on "DFID"/"DFID"\n",
+                              exp->exp_obd->obd_name, resends,
+                              PFID(&op_data->op_fid1),
+                              PFID(&op_data->op_fid2));
+                       goto rebuild;
                 } else {
                         CDEBUG(D_HA, "resend cross eviction\n");
                         RETURN(-EIO);
                 }
-        } else if (rc == 0) {
-                struct mdt_body *body;
-                struct lustre_capa *capa;
-
-                body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
-                LASSERT(body);
-                if (body->valid & OBD_MD_FLMDSCAPA) {
-                        capa = req_capsule_server_get(&req->rq_pill,
-                                                      &RMF_CAPA1);
-                        if (capa == NULL)
-                                rc = -EPROTO;
-                }
         }
 
         *request = req;
@@ -324,7 +279,7 @@ rebuild:
 int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
                struct ptlrpc_request **request)
 {
-        CFS_LIST_HEAD(cancels);
+       struct list_head cancels = LIST_HEAD_INIT(cancels);
         struct obd_device *obd = class_exp2obd(exp);
         struct ptlrpc_request *req = *request;
         int count = 0, rc;
@@ -332,45 +287,52 @@ int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
 
         LASSERT(req == NULL);
 
-        if ((op_data->op_flags & MF_MDC_CANCEL_FID1) &&
-            (fid_is_sane(&op_data->op_fid1)) &&
-            !OBD_FAIL_CHECK(OBD_FAIL_LDLM_BL_CALLBACK))
-                count = mdc_resource_get_unused(exp, &op_data->op_fid1,
-                                                &cancels, LCK_EX,
-                                                MDS_INODELOCK_UPDATE);
-        if ((op_data->op_flags & MF_MDC_CANCEL_FID3) &&
-            (fid_is_sane(&op_data->op_fid3)) &&
-            !OBD_FAIL_CHECK(OBD_FAIL_LDLM_BL_CALLBACK))
-                count += mdc_resource_get_unused(exp, &op_data->op_fid3,
-                                                 &cancels, LCK_EX,
-                                                 MDS_INODELOCK_FULL);
+       if ((op_data->op_flags & MF_MDC_CANCEL_FID1) &&
+           (fid_is_sane(&op_data->op_fid1)))
+               count = mdc_resource_get_unused(exp, &op_data->op_fid1,
+                                               &cancels, LCK_EX,
+                                               MDS_INODELOCK_UPDATE);
+       if ((op_data->op_flags & MF_MDC_CANCEL_FID3) &&
+           (fid_is_sane(&op_data->op_fid3)))
+               /* don't cancel DoM lock which may cause data flush */
+               count += mdc_resource_get_unused(exp, &op_data->op_fid3,
+                                                &cancels, LCK_EX,
+                                                MDS_INODELOCK_ELC);
         req = ptlrpc_request_alloc(class_exp2cliimp(exp),
                                    &RQF_MDS_REINT_UNLINK);
         if (req == NULL) {
                 ldlm_lock_list_put(&cancels, l_bl_ast, count);
                 RETURN(-ENOMEM);
         }
-        mdc_set_capa_size(req, &RMF_CAPA1, op_data->op_capa1);
+
         req_capsule_set_size(&req->rq_pill, &RMF_NAME, RCL_CLIENT,
                              op_data->op_namelen + 1);
 
-        rc = mdc_prep_elc_req(exp, req, &cancels, count);
-        if (rc) {
-                ptlrpc_request_free(req);
-                RETURN(rc);
-        }
+       /* get SELinux policy info if any */
+       rc = sptlrpc_get_sepol(req);
+       if (rc < 0) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
+       req_capsule_set_size(&req->rq_pill, &RMF_SELINUX_POL, RCL_CLIENT,
+                            strlen(req->rq_sepol) ?
+                            strlen(req->rq_sepol) + 1 : 0);
 
-        mdc_unlink_pack(req, op_data);
+       rc = mdc_prep_elc_req(exp, req, MDS_REINT, &cancels, count);
+       if (rc) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
 
-        req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
-                             obd->u.cli.cl_max_mds_easize);
-        req_capsule_set_size(&req->rq_pill, &RMF_LOGCOOKIES, RCL_SERVER,
-                             obd->u.cli.cl_max_mds_cookiesize);
-        ptlrpc_request_set_replen(req);
+       mdc_unlink_pack(req, op_data);
+
+       req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
+                            obd->u.cli.cl_default_mds_easize);
+       ptlrpc_request_set_replen(req);
 
         *request = req;
 
-        rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL);
+       rc = mdc_reint(req, LUSTRE_IMP_FULL);
         if (rc == -ERESTARTSYS)
                 rc = 0;
         RETURN(rc);
@@ -379,8 +341,7 @@ int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
 int mdc_link(struct obd_export *exp, struct md_op_data *op_data,
              struct ptlrpc_request **request)
 {
-        CFS_LIST_HEAD(cancels);
-        struct obd_device *obd = exp->exp_obd;
+       struct list_head cancels = LIST_HEAD_INIT(cancels);
         struct ptlrpc_request *req;
         int count = 0, rc;
         ENTRY;
@@ -401,21 +362,30 @@ int mdc_link(struct obd_export *exp, struct md_op_data *op_data,
                 ldlm_lock_list_put(&cancels, l_bl_ast, count);
                 RETURN(-ENOMEM);
         }
-        mdc_set_capa_size(req, &RMF_CAPA1, op_data->op_capa1);
-        mdc_set_capa_size(req, &RMF_CAPA2, op_data->op_capa2);
+
         req_capsule_set_size(&req->rq_pill, &RMF_NAME, RCL_CLIENT,
                              op_data->op_namelen + 1);
 
-        rc = mdc_prep_elc_req(exp, req, &cancels, count);
-        if (rc) {
-                ptlrpc_request_free(req);
-                RETURN(rc);
-        }
+       /* get SELinux policy info if any */
+       rc = sptlrpc_get_sepol(req);
+       if (rc < 0) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
+       req_capsule_set_size(&req->rq_pill, &RMF_SELINUX_POL, RCL_CLIENT,
+                            strlen(req->rq_sepol) ?
+                            strlen(req->rq_sepol) + 1 : 0);
+
+       rc = mdc_prep_elc_req(exp, req, MDS_REINT, &cancels, count);
+       if (rc) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
 
         mdc_link_pack(req, op_data);
         ptlrpc_request_set_replen(req);
 
-        rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL);
+       rc = mdc_reint(req, LUSTRE_IMP_FULL);
         *request = req;
         if (rc == -ERESTARTSYS)
                 rc = 0;
@@ -424,69 +394,137 @@ int mdc_link(struct obd_export *exp, struct md_op_data *op_data,
 }
 
 int mdc_rename(struct obd_export *exp, struct md_op_data *op_data,
-               const char *old, int oldlen, const char *new, int newlen,
-               struct ptlrpc_request **request)
+               const char *old, size_t oldlen, const char *new, size_t newlen,
+               struct ptlrpc_request **request)
 {
-        CFS_LIST_HEAD(cancels);
-        struct obd_device *obd = exp->exp_obd;
-        struct ptlrpc_request *req;
-        int count = 0, rc;
-        ENTRY;
-
-        if ((op_data->op_flags & MF_MDC_CANCEL_FID1) &&
-            (fid_is_sane(&op_data->op_fid1)))
-                count = mdc_resource_get_unused(exp, &op_data->op_fid1,
-                                                &cancels, LCK_EX,
-                                                MDS_INODELOCK_UPDATE);
-        if ((op_data->op_flags & MF_MDC_CANCEL_FID2) &&
-            (fid_is_sane(&op_data->op_fid2)))
-                count += mdc_resource_get_unused(exp, &op_data->op_fid2,
-                                                 &cancels, LCK_EX,
-                                                 MDS_INODELOCK_UPDATE);
-        if ((op_data->op_flags & MF_MDC_CANCEL_FID3) &&
-            (fid_is_sane(&op_data->op_fid3)))
-                count += mdc_resource_get_unused(exp, &op_data->op_fid3,
-                                                 &cancels, LCK_EX,
-                                                 MDS_INODELOCK_LOOKUP);
-        if ((op_data->op_flags & MF_MDC_CANCEL_FID4) &&
-             (fid_is_sane(&op_data->op_fid4)))
-                count += mdc_resource_get_unused(exp, &op_data->op_fid4,
-                                                 &cancels, LCK_EX,
-                                                 MDS_INODELOCK_FULL);
-
-        req = ptlrpc_request_alloc(class_exp2cliimp(exp),
-                                   &RQF_MDS_REINT_RENAME);
-        if (req == NULL) {
-                ldlm_lock_list_put(&cancels, l_bl_ast, count);
-                RETURN(-ENOMEM);
-        }
-
-        mdc_set_capa_size(req, &RMF_CAPA1, op_data->op_capa1);
-        mdc_set_capa_size(req, &RMF_CAPA2, op_data->op_capa2);
-        req_capsule_set_size(&req->rq_pill, &RMF_NAME, RCL_CLIENT, oldlen + 1);
-        req_capsule_set_size(&req->rq_pill, &RMF_SYMTGT, RCL_CLIENT, newlen+1);
-
-        rc = mdc_prep_elc_req(exp, req, &cancels, count);
-        if (rc) {
-                ptlrpc_request_free(req);
-                RETURN(rc);
-        }
-
-        if (exp_connect_cancelset(exp) && req)
-                ldlm_cli_cancel_list(&cancels, count, req, 0);
-
-        mdc_rename_pack(req, op_data, old, oldlen, new, newlen);
-
-        req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
-                             obd->u.cli.cl_max_mds_easize);
-        req_capsule_set_size(&req->rq_pill, &RMF_LOGCOOKIES, RCL_SERVER,
-                             obd->u.cli.cl_max_mds_cookiesize);
-        ptlrpc_request_set_replen(req);
-
-        rc = mdc_reint(req, obd->u.cli.cl_rpc_lock, LUSTRE_IMP_FULL);
-        *request = req;
-        if (rc == -ERESTARTSYS)
-                rc = 0;
+       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       struct obd_device *obd = exp->exp_obd;
+       struct ptlrpc_request *req;
+       int count = 0, rc;
+
+       ENTRY;
+
+       if ((op_data->op_flags & MF_MDC_CANCEL_FID1) &&
+           (fid_is_sane(&op_data->op_fid1)))
+               count = mdc_resource_get_unused(exp, &op_data->op_fid1,
+                                               &cancels, LCK_EX,
+                                               MDS_INODELOCK_UPDATE);
+       if ((op_data->op_flags & MF_MDC_CANCEL_FID2) &&
+           (fid_is_sane(&op_data->op_fid2)))
+               count += mdc_resource_get_unused(exp, &op_data->op_fid2,
+                                                &cancels, LCK_EX,
+                                                MDS_INODELOCK_UPDATE);
+       if ((op_data->op_flags & MF_MDC_CANCEL_FID3) &&
+           (fid_is_sane(&op_data->op_fid3)))
+               count += mdc_resource_get_unused(exp, &op_data->op_fid3,
+                                                &cancels, LCK_EX,
+                                                MDS_INODELOCK_LOOKUP);
+       if ((op_data->op_flags & MF_MDC_CANCEL_FID4) &&
+           (fid_is_sane(&op_data->op_fid4)))
+               count += mdc_resource_get_unused(exp, &op_data->op_fid4,
+                                                &cancels, LCK_EX,
+                                                MDS_INODELOCK_ELC);
+
+       req = ptlrpc_request_alloc(class_exp2cliimp(exp),
+                          op_data->op_cli_flags & CLI_MIGRATE ?
+                          &RQF_MDS_REINT_MIGRATE : &RQF_MDS_REINT_RENAME);
+       if (req == NULL) {
+               ldlm_lock_list_put(&cancels, l_bl_ast, count);
+               RETURN(-ENOMEM);
+       }
+
+       req_capsule_set_size(&req->rq_pill, &RMF_NAME, RCL_CLIENT, oldlen + 1);
+       req_capsule_set_size(&req->rq_pill, &RMF_SYMTGT, RCL_CLIENT, newlen+1);
+       if (op_data->op_cli_flags & CLI_MIGRATE)
+               req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_CLIENT,
+                                    op_data->op_data_size);
+
+       /* get SELinux policy info if any */
+       rc = sptlrpc_get_sepol(req);
+       if (rc < 0) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
+       req_capsule_set_size(&req->rq_pill, &RMF_SELINUX_POL, RCL_CLIENT,
+                            strlen(req->rq_sepol) ?
+                            strlen(req->rq_sepol) + 1 : 0);
+
+       rc = mdc_prep_elc_req(exp, req, MDS_REINT, &cancels, count);
+       if (rc) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
+
+       if (exp_connect_cancelset(exp) && req)
+               ldlm_cli_cancel_list(&cancels, count, req, 0);
+
+       if (op_data->op_cli_flags & CLI_MIGRATE)
+               mdc_migrate_pack(req, op_data, old, oldlen);
+       else
+               mdc_rename_pack(req, op_data, old, oldlen, new, newlen);
+
+       req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
+                            obd->u.cli.cl_default_mds_easize);
+       ptlrpc_request_set_replen(req);
+
+       rc = mdc_reint(req, LUSTRE_IMP_FULL);
+       *request = req;
+       if (rc == -ERESTARTSYS)
+               rc = 0;
+
+       RETURN(rc);
+}
 
-        RETURN(rc);
+int mdc_file_resync(struct obd_export *exp, struct md_op_data *op_data)
+{
+       struct list_head cancels = LIST_HEAD_INIT(cancels);
+       struct ptlrpc_request *req;
+       struct ldlm_lock *lock;
+       struct mdt_rec_resync *rec;
+       int count = 0, rc;
+       ENTRY;
+
+       if (op_data->op_flags & MF_MDC_CANCEL_FID1 &&
+           fid_is_sane(&op_data->op_fid1))
+               count = mdc_resource_get_unused(exp, &op_data->op_fid1,
+                                               &cancels, LCK_EX,
+                                               MDS_INODELOCK_LAYOUT);
+
+       req = ptlrpc_request_alloc(class_exp2cliimp(exp),
+                                  &RQF_MDS_REINT_RESYNC);
+       if (req == NULL) {
+               ldlm_lock_list_put(&cancels, l_bl_ast, count);
+               RETURN(-ENOMEM);
+       }
+
+       rc = mdc_prep_elc_req(exp, req, MDS_REINT, &cancels, count);
+       if (rc) {
+               ptlrpc_request_free(req);
+               RETURN(rc);
+       }
+
+       CLASSERT(sizeof(*rec) == sizeof(struct mdt_rec_reint));
+       rec = req_capsule_client_get(&req->rq_pill, &RMF_REC_REINT);
+       rec->rs_opcode  = REINT_RESYNC;
+       rec->rs_fsuid   = op_data->op_fsuid;
+       rec->rs_fsgid   = op_data->op_fsgid;
+       rec->rs_cap     = op_data->op_cap;
+       rec->rs_fid     = op_data->op_fid1;
+       rec->rs_bias    = op_data->op_bias;
+       rec->rs_mirror_id = op_data->op_mirror_id;
+
+       lock = ldlm_handle2lock(&op_data->op_lease_handle);
+       if (lock != NULL) {
+               rec->rs_lease_handle = lock->l_remote_handle;
+               LDLM_LOCK_PUT(lock);
+       }
+
+       ptlrpc_request_set_replen(req);
+
+       rc = mdc_reint(req, LUSTRE_IMP_FULL);
+       if (rc == -ERESTARTSYS)
+               rc = 0;
+
+       ptlrpc_req_finished(req);
+       RETURN(rc);
 }