Whamcloud - gitweb
LU-12624 lod: alloc dir stripes by QoS
[fs/lustre-release.git] / lustre / lmv / lmv_intent.c
index 22a0d21..11a78b1 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
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -35,7 +31,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LMV
-#ifdef __KERNEL__
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/math64.h>
 #include <linux/seq_file.h>
 #include <linux/namei.h>
-#include <linux/lustre_intent.h>
-#else
-#include <liblustre.h>
-#endif
+#include <lustre_intent.h>
 
 #include <obd_support.h>
-#include <lustre/lustre_idl.h>
 #include <lustre_lib.h>
 #include <lustre_net.h>
 #include <lustre_dlm.h>
@@ -63,7 +54,8 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
                             const struct lu_fid *parent_fid,
                             struct ptlrpc_request **reqp,
                             ldlm_blocking_callback cb_blocking,
-                            __u64 extra_lock_flags)
+                            __u64 extra_lock_flags,
+                            const char *secctx_name, __u32 secctx_name_size)
 {
        struct obd_device       *obd = exp->exp_obd;
        struct lmv_obd          *lmv = &obd->u.lmv;
@@ -83,25 +75,18 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
        LASSERT((body->mbo_valid & OBD_MD_MDS));
 
        /*
-        * Unfortunately, we have to lie to MDC/MDS to retrieve
-        * attributes llite needs and provideproper locking.
-        */
-       if (it->it_op & IT_LOOKUP)
-               it->it_op = IT_GETATTR;
-
-       /*
         * We got LOOKUP lock, but we really need attrs.
         */
-       pmode = it->d.lustre.it_lock_mode;
+       pmode = it->it_lock_mode;
        if (pmode) {
-               plock.cookie = it->d.lustre.it_lock_handle;
-               it->d.lustre.it_lock_mode = 0;
-               it->d.lustre.it_data = NULL;
+               plock.cookie = it->it_lock_handle;
+               it->it_lock_mode = 0;
+               it->it_request = NULL;
        }
 
        LASSERT(fid_is_sane(&body->mbo_fid1));
 
-       tgt = lmv_find_target(lmv, &body->mbo_fid1);
+       tgt = lmv_fid2tgt(lmv, &body->mbo_fid1);
        if (IS_ERR(tgt))
                GOTO(out, rc = PTR_ERR(tgt));
 
@@ -117,14 +102,21 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
                 * see mdt_cross_open */
                LASSERT(it->it_op & IT_OPEN);
                op_data->op_fid2 = *parent_fid;
-               /* Add object FID to op_fid3, in case it needs to check stale
-                * (M_CHECK_STALE), see mdc_finish_intent_lock */
-               op_data->op_fid3 = body->mbo_fid1;
        }
 
        op_data->op_bias = MDS_CROSS_REF;
-       CDEBUG(D_INODE, "REMOTE_INTENT with fid="DFID" -> mds #%d\n",
-              PFID(&body->mbo_fid1), tgt->ltd_idx);
+       CDEBUG(D_INODE, "REMOTE_INTENT with fid="DFID" -> mds #%u\n",
+              PFID(&body->mbo_fid1), tgt->ltd_index);
+
+       /* ask for security context upon intent */
+       if (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_OPEN) &&
+           secctx_name_size != 0 && secctx_name != NULL) {
+               op_data->op_file_secctx_name = secctx_name;
+               op_data->op_file_secctx_name_size = secctx_name_size;
+               CDEBUG(D_SEC, "'%.*s' is security xattr to fetch for "
+                      DFID"\n",
+                      secctx_name_size, secctx_name, PFID(&body->mbo_fid1));
+       }
 
        rc = md_intent_lock(tgt->ltd_exp, op_data, it, &req, cb_blocking,
                            extra_lock_flags);
@@ -136,15 +128,15 @@ static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
         * maintain dcache consistency. Thus drop UPDATE|PERM lock here
         * and put LOOKUP in request.
         */
-       if (it->d.lustre.it_lock_mode != 0) {
-               it->d.lustre.it_remote_lock_handle =
-                                       it->d.lustre.it_lock_handle;
-               it->d.lustre.it_remote_lock_mode = it->d.lustre.it_lock_mode;
+       if (it->it_lock_mode != 0) {
+               it->it_remote_lock_handle =
+                                       it->it_lock_handle;
+               it->it_remote_lock_mode = it->it_lock_mode;
        }
 
        if (pmode) {
-               it->d.lustre.it_lock_handle = plock.cookie;
-               it->d.lustre.it_lock_mode = pmode;
+               it->it_lock_handle = plock.cookie;
+               it->it_lock_mode = pmode;
        }
 
        EXIT;
@@ -159,23 +151,19 @@ out:
        return rc;
 }
 
-#ifdef __KERNEL__
-int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
-                         struct lmv_stripe_md *lsm,
+int lmv_revalidate_slaves(struct obd_export *exp,
+                         const struct lmv_stripe_md *lsm,
                          ldlm_blocking_callback cb_blocking,
                          int extra_lock_flags)
 {
-       struct obd_device      *obd = exp->exp_obd;
-       struct lmv_obd         *lmv = &obd->u.lmv;
-       struct mdt_body         *body;
-       struct md_op_data      *op_data;
-       unsigned long           size = 0;
-       unsigned long           nlink = 0;
-       obd_time                atime = 0;
-       obd_time                ctime = 0;
-       obd_time                mtime = 0;
-       int                     i;
-       int                     rc = 0;
+       struct obd_device *obd = exp->exp_obd;
+       struct lmv_obd *lmv = &obd->u.lmv;
+       struct ptlrpc_request *req = NULL;
+       struct mdt_body *body;
+       struct md_op_data *op_data;
+       int i;
+       int valid_stripe_count = 0;
+       int rc = 0;
 
        ENTRY;
 
@@ -194,7 +182,6 @@ int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
        for (i = 0; i < lsm->lsm_md_stripe_count; i++) {
                struct lu_fid           fid;
                struct lookup_intent    it = { .it_op = IT_GETATTR };
-               struct ptlrpc_request   *req = NULL;
                struct lustre_handle    *lockh = NULL;
                struct lmv_tgt_desc     *tgt = NULL;
                struct inode            *inode;
@@ -202,6 +189,9 @@ int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
                fid = lsm->lsm_md_oinfo[i].lmo_fid;
                inode = lsm->lsm_md_oinfo[i].lmo_root;
 
+               if (!inode)
+                       continue;
+
                /*
                 * Prepare op_data for revalidating. Note that @fid2 shluld be
                 * defined otherwise it will go to server and take new lock
@@ -211,19 +201,30 @@ int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
                op_data->op_fid1 = fid;
                op_data->op_fid2 = fid;
 
-               tgt = lmv_locate_mds(lmv, op_data, &fid);
-               if (IS_ERR(tgt))
-                       GOTO(cleanup, rc = PTR_ERR(tgt));
+               tgt = lmv_tgt(lmv, lsm->lsm_md_oinfo[i].lmo_mds);
+               if (!tgt)
+                       GOTO(cleanup, rc = -ENODEV);
+
+               CDEBUG(D_INODE, "Revalidate slave "DFID" -> mds #%u\n",
+                      PFID(&fid), tgt->ltd_index);
 
-               CDEBUG(D_INODE, "Revalidate slave "DFID" -> mds #%d\n",
-                      PFID(&fid), tgt->ltd_idx);
+               if (req != NULL) {
+                       ptlrpc_req_finished(req);
+                       req = NULL;
+               }
 
                rc = md_intent_lock(tgt->ltd_exp, op_data, &it, &req,
                                    cb_blocking, extra_lock_flags);
+               if (rc == -ENOENT) {
+                       /* skip stripe is not exists */
+                       rc = 0;
+                       continue;
+               }
+
                if (rc < 0)
                        GOTO(cleanup, rc);
 
-               lockh = (struct lustre_handle *)&it.d.lustre.it_lock_handle;
+               lockh = (struct lustre_handle *)&it.it_lock_handle;
                if (rc > 0 && req == NULL) {
                        /* slave inode is still valid */
                        CDEBUG(D_INODE, "slave "DFID" is still valid.\n",
@@ -233,151 +234,138 @@ int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
                        /* refresh slave from server */
                        body = req_capsule_server_get(&req->rq_pill,
                                                      &RMF_MDT_BODY);
-                       LASSERT(body != NULL);
-                       if (unlikely(body->mbo_nlink < 2)) {
-                               CERROR("%s: nlink %d < 2 corrupt stripe %d "DFID
-                                      ":" DFID"\n",
-                                      obd->obd_name, body->mbo_nlink, i,
-                                      PFID(&lsm->lsm_md_oinfo[i].lmo_fid),
-                                      PFID(&lsm->lsm_md_oinfo[0].lmo_fid));
-
-                               if (req != NULL)
-                                       ptlrpc_req_finished(req);
-
-                               if (it.d.lustre.it_lock_mode && lockh) {
+                       if (body == NULL) {
+                               if (it.it_lock_mode && lockh) {
                                        ldlm_lock_decref(lockh,
-                                                it.d.lustre.it_lock_mode);
-                                       it.d.lustre.it_lock_mode = 0;
+                                                it.it_lock_mode);
+                                       it.it_lock_mode = 0;
                                }
-
-                               GOTO(cleanup, rc = -EIO);
+                               GOTO(cleanup, rc = -ENOENT);
                        }
 
-
                        i_size_write(inode, body->mbo_size);
+                       inode->i_blocks = body->mbo_blocks;
                        set_nlink(inode, body->mbo_nlink);
-                       LTIME_S(inode->i_atime) = body->mbo_atime;
-                       LTIME_S(inode->i_ctime) = body->mbo_ctime;
-                       LTIME_S(inode->i_mtime) = body->mbo_mtime;
-
-                       if (req != NULL)
-                               ptlrpc_req_finished(req);
+                       inode->i_atime.tv_sec = body->mbo_atime;
+                       inode->i_ctime.tv_sec = body->mbo_ctime;
+                       inode->i_mtime.tv_sec = body->mbo_mtime;
                }
 
-               md_set_lock_data(tgt->ltd_exp, &lockh->cookie, inode, NULL);
-
-               size += i_size_read(inode);
-
-               if (i != 0)
-                       nlink += inode->i_nlink - 2;
-               else
-                       nlink += inode->i_nlink;
-
-               atime = LTIME_S(inode->i_atime) > atime ?
-                               LTIME_S(inode->i_atime) : atime;
-               ctime = LTIME_S(inode->i_ctime) > ctime ?
-                               LTIME_S(inode->i_ctime) : ctime;
-               mtime = LTIME_S(inode->i_mtime) > mtime ?
-                               LTIME_S(inode->i_mtime) : mtime;
-
-               if (it.d.lustre.it_lock_mode != 0 && lockh != NULL) {
-                       ldlm_lock_decref(lockh, it.d.lustre.it_lock_mode);
-                       it.d.lustre.it_lock_mode = 0;
+               md_set_lock_data(tgt->ltd_exp, lockh, inode, NULL);
+               if (it.it_lock_mode != 0 && lockh != NULL) {
+                       ldlm_lock_decref(lockh, it.it_lock_mode);
+                       it.it_lock_mode = 0;
                }
 
-               CDEBUG(D_INODE, "i %d "DFID" size %llu, nlink %u, atime "
-                      "%lu, mtime %lu, ctime %lu.\n", i, PFID(&fid),
-                      i_size_read(inode), inode->i_nlink,
-                      LTIME_S(inode->i_atime), LTIME_S(inode->i_mtime),
-                      LTIME_S(inode->i_ctime));
+               valid_stripe_count++;
        }
 
-       /*
-        * update attr of master request.
-        */
-       CDEBUG(D_INODE, "Return refreshed attrs: size = %lu nlink %lu atime "
-              LPU64 "ctime "LPU64" mtime "LPU64" for " DFID"\n", size, nlink,
-              atime, ctime, mtime, PFID(&lsm->lsm_md_oinfo[0].lmo_fid));
-
-       if (mbody != NULL) {
-               mbody->mbo_atime = atime;
-               mbody->mbo_ctime = ctime;
-               mbody->mbo_mtime = mtime;
-       }
 cleanup:
-       OBD_FREE_PTR(op_data);
-       RETURN(rc);
-}
+       if (req != NULL)
+               ptlrpc_req_finished(req);
 
-#else
+       /* if all stripes are invalid, return -ENOENT to notify user */
+       if (!rc && !valid_stripe_count)
+               rc = -ENOENT;
 
-int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
-                         struct lmv_stripe_md *lsm,
-                         ldlm_blocking_callback cb_blocking,
-                         int extra_lock_flags)
-{
-       return 0;
+       OBD_FREE_PTR(op_data);
+       RETURN(rc);
 }
 
-#endif
-
 /*
  * IT_OPEN is intended to open (and create, possible) an object. Parent (pid)
  * may be split dir.
  */
-int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
-                   struct lookup_intent *it, struct ptlrpc_request **reqp,
-                   ldlm_blocking_callback cb_blocking, __u64 extra_lock_flags)
+static int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
+                          struct lookup_intent *it,
+                          struct ptlrpc_request **reqp,
+                          ldlm_blocking_callback cb_blocking,
+                          __u64 extra_lock_flags)
 {
-       struct obd_device       *obd = exp->exp_obd;
-       struct lmv_obd          *lmv = &obd->u.lmv;
-       struct lmv_tgt_desc     *tgt;
-       struct mdt_body         *body;
-       int                     rc;
+       struct obd_device *obd = exp->exp_obd;
+       struct lmv_obd *lmv = &obd->u.lmv;
+       struct lmv_tgt_desc *tgt;
+       struct mdt_body *body;
+       __u64 flags = it->it_flags;
+       int rc;
+
        ENTRY;
 
-       /* Note: client might open with some random flags(sanity 33b), so we can
-        * not make sure op_fid2 is being initialized with BY_FID flag */
-       if (it->it_flags & MDS_OPEN_BY_FID && fid_is_sane(&op_data->op_fid2)) {
-               if (op_data->op_mea1 != NULL) {
-                       struct lmv_stripe_md    *lsm = op_data->op_mea1;
-                       const struct lmv_oinfo  *oinfo;
-
-                       oinfo = lsm_name_to_stripe_info(lsm, op_data->op_name,
-                                                       op_data->op_namelen);
-                       if (IS_ERR(oinfo))
-                               RETURN(PTR_ERR(oinfo));
-                       op_data->op_fid1 = oinfo->lmo_fid;
+       /* do not allow file creation in foreign dir */
+       if ((it->it_op & IT_CREAT) && lmv_dir_foreign(op_data->op_mea1))
+               RETURN(-ENODATA);
+
+       if ((it->it_op & IT_CREAT) && !(flags & MDS_OPEN_BY_FID)) {
+               /* don't allow create under dir with bad hash */
+               if (lmv_dir_bad_hash(op_data->op_mea1))
+                       RETURN(-EBADF);
+
+               if (lmv_dir_migrating(op_data->op_mea1)) {
+                       if (flags & O_EXCL) {
+                               /*
+                                * open(O_CREAT | O_EXCL) needs to check
+                                * existing name, which should be done on both
+                                * old and new layout, check old layout on
+                                * client side.
+                                */
+                               rc = lmv_migrate_existence_check(lmv, op_data);
+                               if (rc != -ENOENT)
+                                       RETURN(rc);
+
+                               op_data->op_post_migrate = true;
+                       } else {
+                               /*
+                                * open(O_CREAT) will be sent to MDT in old
+                                * layout first, to avoid creating new file
+                                * under old layout, clear O_CREAT.
+                                */
+                               it->it_flags &= ~O_CREAT;
+                       }
                }
+       }
+
+retry:
+       if (it->it_flags & MDS_OPEN_BY_FID) {
+               LASSERT(fid_is_sane(&op_data->op_fid2));
 
-               tgt = lmv_find_target(lmv, &op_data->op_fid2);
+               /* for striped directory, we can't know parent stripe fid
+                * without name, but we can set it to child fid, and MDT
+                * will obtain it from linkea in open in such case. */
+               if (lmv_dir_striped(op_data->op_mea1))
+                       op_data->op_fid1 = op_data->op_fid2;
+
+               tgt = lmv_fid2tgt(lmv, &op_data->op_fid2);
                if (IS_ERR(tgt))
                        RETURN(PTR_ERR(tgt));
 
-               op_data->op_mds = tgt->ltd_idx;
+               op_data->op_mds = tgt->ltd_index;
        } else {
-               tgt = lmv_locate_mds(lmv, op_data, &op_data->op_fid1);
+               LASSERT(fid_is_sane(&op_data->op_fid1));
+               LASSERT(it->it_flags & MDS_OPEN_PCC ||
+                       fid_is_zero(&op_data->op_fid2));
+               LASSERT(op_data->op_name != NULL);
+
+               tgt = lmv_locate_tgt(lmv, op_data);
                if (IS_ERR(tgt))
                        RETURN(PTR_ERR(tgt));
        }
 
        /* If it is ready to open the file by FID, do not need
         * allocate FID at all, otherwise it will confuse MDT */
-       if ((it->it_op & IT_CREAT) &&
-           !(it->it_flags & MDS_OPEN_BY_FID)) {
+       if ((it->it_op & IT_CREAT) && !(it->it_flags & MDS_OPEN_BY_FID ||
+                                       it->it_flags & MDS_OPEN_PCC)) {
                /*
-                * For open with IT_CREATE and for IT_CREATE cases allocate new
-                * fid and setup FLD for it.
+                * For lookup(IT_CREATE) cases allocate new fid and setup FLD
+                * for it.
                 */
-               op_data->op_fid3 = op_data->op_fid2;
                rc = lmv_fid_alloc(NULL, exp, &op_data->op_fid2, op_data);
                if (rc != 0)
                        RETURN(rc);
        }
 
        CDEBUG(D_INODE, "OPEN_INTENT with fid1="DFID", fid2="DFID","
-              " name='%s' -> mds #%d\n", PFID(&op_data->op_fid1),
-              PFID(&op_data->op_fid2), op_data->op_name, tgt->ltd_idx);
+              " name='%s' -> mds #%u\n", PFID(&op_data->op_fid1),
+              PFID(&op_data->op_fid2), op_data->op_name, tgt->ltd_index);
 
        rc = md_intent_lock(tgt->ltd_exp, op_data, it, reqp, cb_blocking,
                            extra_lock_flags);
@@ -387,10 +375,23 @@ int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
         * Nothing is found, do not access body->fid1 as it is zero and thus
         * pointless.
         */
-       if ((it->d.lustre.it_disposition & DISP_LOOKUP_NEG) &&
-           !(it->d.lustre.it_disposition & DISP_OPEN_CREATE) &&
-           !(it->d.lustre.it_disposition & DISP_OPEN_OPEN))
+       if ((it->it_disposition & DISP_LOOKUP_NEG) &&
+           !(it->it_disposition & DISP_OPEN_CREATE) &&
+           !(it->it_disposition & DISP_OPEN_OPEN)) {
+               if (!(it->it_flags & MDS_OPEN_BY_FID) &&
+                   lmv_dir_retry_check_update(op_data)) {
+                       ptlrpc_req_finished(*reqp);
+                       it->it_request = NULL;
+                       it->it_disposition = 0;
+                       *reqp = NULL;
+
+                       it->it_flags = flags;
+                       fid_zero(&op_data->op_fid2);
+                       goto retry;
+               }
+
                RETURN(rc);
+       }
 
        body = req_capsule_server_get(&(*reqp)->rq_pill, &RMF_MDT_BODY);
        if (body == NULL)
@@ -399,7 +400,9 @@ int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
        /* Not cross-ref case, just get out of here. */
        if (unlikely((body->mbo_valid & OBD_MD_MDS))) {
                rc = lmv_intent_remote(exp, it, &op_data->op_fid1, reqp,
-                                      cb_blocking, extra_lock_flags);
+                                      cb_blocking, extra_lock_flags,
+                                      op_data->op_file_secctx_name,
+                                      op_data->op_file_secctx_name_size);
                if (rc != 0)
                        RETURN(rc);
 
@@ -420,15 +423,23 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
                  ldlm_blocking_callback cb_blocking,
                  __u64 extra_lock_flags)
 {
-       struct obd_device       *obd = exp->exp_obd;
-       struct lmv_obd          *lmv = &obd->u.lmv;
-       struct lmv_tgt_desc     *tgt = NULL;
-       struct mdt_body         *body;
-       struct lmv_stripe_md    *lsm = op_data->op_mea1;
-       int                     rc = 0;
+       struct obd_device *obd = exp->exp_obd;
+       struct lmv_obd *lmv = &obd->u.lmv;
+       struct lmv_tgt_desc *tgt = NULL;
+       struct mdt_body *body;
+       int rc;
        ENTRY;
 
-       tgt = lmv_locate_mds(lmv, op_data, &op_data->op_fid1);
+       /* foreign dir is not striped */
+       if (lmv_dir_foreign(op_data->op_mea1)) {
+               /* only allow getattr/lookup for itself */
+               if (op_data->op_name != NULL)
+                       RETURN(-ENODATA);
+               RETURN(0);
+       }
+
+retry:
+       tgt = lmv_locate_tgt(lmv, op_data);
        if (IS_ERR(tgt))
                RETURN(PTR_ERR(tgt));
 
@@ -436,10 +447,10 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
                fid_zero(&op_data->op_fid2);
 
        CDEBUG(D_INODE, "LOOKUP_INTENT with fid1="DFID", fid2="DFID
-              ", name='%s' -> mds #%d lsm=%p lsm_magic=%x\n",
+              ", name='%s' -> mds #%u\n",
               PFID(&op_data->op_fid1), PFID(&op_data->op_fid2),
               op_data->op_name ? op_data->op_name : "<NULL>",
-              tgt->ltd_idx, lsm, lsm == NULL ? -1 : lsm->lsm_md_magic);
+              tgt->ltd_index);
 
        op_data->op_bias &= ~MDS_CROSS_REF;
 
@@ -451,35 +462,27 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
        if (*reqp == NULL) {
                /* If RPC happens, lsm information will be revalidated
                 * during update_inode process (see ll_update_lsm_md) */
-               if (op_data->op_mea2 != NULL) {
-                       rc = lmv_revalidate_slaves(exp, NULL, op_data->op_mea2,
+               if (lmv_dir_striped(op_data->op_mea2)) {
+                       rc = lmv_revalidate_slaves(exp, op_data->op_mea2,
                                                   cb_blocking,
                                                   extra_lock_flags);
                        if (rc != 0)
                                RETURN(rc);
                }
                RETURN(rc);
-       } else if (it_disposition(it, DISP_LOOKUP_NEG) && lsm != NULL &&
-                  lsm->lsm_md_hash_type & LMV_HASH_FLAG_MIGRATION) {
-               /* For migrating directory, if it can not find the child in
-                * the source directory(master stripe), try the targeting
-                * directory(stripe 1) */
-               tgt = lmv_find_target(lmv, &lsm->lsm_md_oinfo[1].lmo_fid);
-               if (IS_ERR(tgt))
-                       RETURN(PTR_ERR(tgt));
-
+       } else if (it_disposition(it, DISP_LOOKUP_NEG) &&
+                  lmv_dir_retry_check_update(op_data)) {
                ptlrpc_req_finished(*reqp);
-               it->d.lustre.it_data = NULL;
+               it->it_request = NULL;
+               it->it_disposition = 0;
                *reqp = NULL;
 
-               CDEBUG(D_INODE, "For migrating dir, try target dir "DFID"\n",
-                      PFID(&lsm->lsm_md_oinfo[1].lmo_fid));
-
-               op_data->op_fid1 = lsm->lsm_md_oinfo[1].lmo_fid;
-               it->d.lustre.it_disposition &= ~DISP_ENQ_COMPLETE;
-               rc = md_intent_lock(tgt->ltd_exp, op_data, it, reqp,
-                                   cb_blocking, extra_lock_flags);
+               goto retry;
        }
+
+       if (!it_has_reply_body(it))
+               RETURN(0);
+
        /*
         * MDS has returned success. Probably name has been resolved in
         * remote inode. Let's check this.
@@ -491,7 +494,9 @@ lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
        /* Not cross-ref case, just get out of here. */
        if (unlikely((body->mbo_valid & OBD_MD_MDS))) {
                rc = lmv_intent_remote(exp, it, NULL, reqp, cb_blocking,
-                                      extra_lock_flags);
+                                      extra_lock_flags,
+                                      op_data->op_file_secctx_name,
+                                      op_data->op_file_secctx_name_size);
                if (rc != 0)
                        RETURN(rc);
                body = req_capsule_server_get(&(*reqp)->rq_pill, &RMF_MDT_BODY);
@@ -507,22 +512,18 @@ int lmv_intent_lock(struct obd_export *exp, struct md_op_data *op_data,
                    ldlm_blocking_callback cb_blocking,
                    __u64 extra_lock_flags)
 {
-        struct obd_device *obd = exp->exp_obd;
-        int                rc;
-        ENTRY;
-
-        LASSERT(it != NULL);
-        LASSERT(fid_is_sane(&op_data->op_fid1));
+       int rc;
+       ENTRY;
 
-        CDEBUG(D_INODE, "INTENT LOCK '%s' for '%*s' on "DFID"\n",
-               LL_IT2STR(it), op_data->op_namelen, op_data->op_name,
-               PFID(&op_data->op_fid1));
+       LASSERT(it != NULL);
+       LASSERT(fid_is_sane(&op_data->op_fid1));
 
-        rc = lmv_check_connect(obd);
-        if (rc)
-                RETURN(rc);
+       CDEBUG(D_INODE, "INTENT LOCK '%s' for "DFID" '%.*s' on "DFID"\n",
+               LL_IT2STR(it), PFID(&op_data->op_fid2),
+               (int)op_data->op_namelen, op_data->op_name,
+               PFID(&op_data->op_fid1));
 
-       if (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_LAYOUT))
+       if (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_LAYOUT | IT_GETXATTR))
                rc = lmv_intent_lookup(exp, op_data, it, reqp, cb_blocking,
                                       extra_lock_flags);
        else if (it->it_op & IT_OPEN)
@@ -531,5 +532,27 @@ int lmv_intent_lock(struct obd_export *exp, struct md_op_data *op_data,
        else
                LBUG();
 
+       if (rc < 0) {
+               struct lustre_handle lock_handle;
+
+               if (it->it_lock_mode != 0) {
+                       lock_handle.cookie = it->it_lock_handle;
+                       ldlm_lock_decref_and_cancel(&lock_handle,
+                                                   it->it_lock_mode);
+               }
+
+               it->it_lock_handle = 0;
+               it->it_lock_mode = 0;
+
+               if (it->it_remote_lock_mode != 0) {
+                       lock_handle.cookie = it->it_remote_lock_handle;
+                       ldlm_lock_decref_and_cancel(&lock_handle,
+                                                   it->it_remote_lock_mode);
+               }
+
+               it->it_remote_lock_handle = 0;
+               it->it_remote_lock_mode = 0;
+       }
+
        RETURN(rc);
 }