Whamcloud - gitweb
LU-3200 mdc: layout lock rpc must not take rpc_lock
[fs/lustre-release.git] / lustre / mdc / mdc_locks.c
index e89e46c..f2d666f 100644 (file)
@@ -1,27 +1,39 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- * Copyright (C) 2001-2003 Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.sf.net/projects/lustre/
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * 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
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2013, 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__
 # include <liblustre.h>
 #endif
 
-#include <linux/obd_class.h>
-#include <linux/lustre_mds.h>
-#include <linux/lustre_dlm.h>
-#include <linux/lustre_sec.h>
-#include <linux/lprocfs_status.h>
-#include <linux/lustre_acl.h>
-#include <linux/lustre_gs.h>
-#include <linux/lustre_lite.h>
+#include <lustre_acl.h>
+#include <obd_class.h>
+#include <lustre_dlm.h>
+/* fid_res_name_eq() */
+#include <lustre_fid.h>
+#include <lprocfs_status.h>
 #include "mdc_internal.h"
 
+struct mdc_getattr_args {
+        struct obd_export           *ga_exp;
+        struct md_enqueue_info      *ga_minfo;
+        struct ldlm_enqueue_info    *ga_einfo;
+};
+
 int it_disposition(struct lookup_intent *it, int flag)
 {
-        return LUSTRE_IT(it)->it_disposition & flag;
+        return it->d.lustre.it_disposition & flag;
 }
 EXPORT_SYMBOL(it_disposition);
 
 void it_set_disposition(struct lookup_intent *it, int flag)
 {
-        LUSTRE_IT(it)->it_disposition |= flag;
+        it->d.lustre.it_disposition |= flag;
 }
 EXPORT_SYMBOL(it_set_disposition);
 
-static void mdc_id2mdc_data(struct mdc_op_data *data,
-                            struct lustre_id *f1, 
-                            struct lustre_id *f2,
-                            const char *name, 
-                            int namelen, int mode)
+void it_clear_disposition(struct lookup_intent *it, int flag)
 {
-        LASSERT(data);
-        LASSERT(f1);
-
-        data->id1 = *f1;
-        if (f2)
-                data->id2 = *f2;
-
-        data->valid = 0;
-        data->name = name;
-        data->namelen = namelen;
-        data->create_mode = mode;
-        data->mod_time = LTIME_S(CURRENT_TIME);
-}
-
-static int it_to_lock_mode(struct lookup_intent *it)
-{
-        /* CREAT needs to be tested before open (both could be set) */
-        if (it->it_op & IT_CREAT)
-                return LCK_PW;
-        else if (it->it_op & (IT_READDIR | IT_GETATTR | IT_OPEN | IT_LOOKUP |
-                              IT_CHDIR))
-                return LCK_PR;
-
-        LBUG();
-        RETURN(-EINVAL);
+        it->d.lustre.it_disposition &= ~flag;
 }
+EXPORT_SYMBOL(it_clear_disposition);
 
 int it_open_error(int phase, struct lookup_intent *it)
 {
         if (it_disposition(it, DISP_OPEN_OPEN)) {
-                if (phase == DISP_OPEN_OPEN)
-                        return LUSTRE_IT(it)->it_status;
+                if (phase >= DISP_OPEN_OPEN)
+                        return it->d.lustre.it_status;
                 else
                         return 0;
         }
 
         if (it_disposition(it, DISP_OPEN_CREATE)) {
-                if (phase == DISP_OPEN_CREATE)
-                        return LUSTRE_IT(it)->it_status;
+                if (phase >= DISP_OPEN_CREATE)
+                        return it->d.lustre.it_status;
                 else
                         return 0;
         }
 
         if (it_disposition(it, DISP_LOOKUP_EXECD)) {
-                if (phase == DISP_LOOKUP_EXECD)
-                        return LUSTRE_IT(it)->it_status;
+                if (phase >= DISP_LOOKUP_EXECD)
+                        return it->d.lustre.it_status;
                 else
                         return 0;
         }
 
         if (it_disposition(it, DISP_IT_EXECD)) {
-                if (phase == DISP_IT_EXECD)
-                        return LUSTRE_IT(it)->it_status;
+                if (phase >= DISP_IT_EXECD)
+                        return it->d.lustre.it_status;
                 else
                         return 0;
         }
-        CERROR("it disp: %X, status: %d\n", LUSTRE_IT(it)->it_disposition,
-               LUSTRE_IT(it)->it_status);
+        CERROR("it disp: %X, status: %d\n", it->d.lustre.it_disposition,
+               it->d.lustre.it_status);
         LBUG();
         return 0;
 }
 EXPORT_SYMBOL(it_open_error);
 
 /* this must be called on a lockh that is known to have a referenced lock */
-int mdc_set_lock_data(struct obd_export *exp, __u64 *l, void *data)
+int mdc_set_lock_data(struct obd_export *exp, __u64 *lockh, void *data,
+                      __u64 *bits)
 {
-        struct ldlm_lock *lock;
-        struct lustre_handle *lockh = (struct lustre_handle *)l;
+       struct ldlm_lock *lock;
+       struct inode *new_inode = data;
         ENTRY;
 
-        if (!*l) {
-                EXIT;
-                return 0;
-        }
+        if(bits)
+                *bits = 0;
 
-        lock = ldlm_handle2lock(lockh);
+        if (!*lockh)
+                RETURN(0);
+
+        lock = ldlm_handle2lock((struct lustre_handle *)lockh);
 
         LASSERT(lock != NULL);
         lock_res_and_lock(lock);
 #ifdef __KERNEL__
-        if (lock->l_ast_data && lock->l_ast_data != data) {
-                struct ll_inode_info *lli = ll_i2info(data);
-                struct inode *new_inode = data;
-                LASSERT(lli->lli_inode_magic == LLI_INODE_MAGIC);
-                struct inode *old_inode = lock->l_ast_data;
-                if (!(old_inode->i_state & I_FREEING)) {
-                        CERROR("Found existing inode %p/%lu/%u state %lu "
-                               "in lock: setting data to %p/%lu/%u\n",
-                               old_inode, old_inode->i_ino,
-                               old_inode->i_generation, old_inode->i_state,
-                               new_inode, new_inode->i_ino,
-                               new_inode->i_generation);
-                        unlock_res_and_lock(lock);
-                        LBUG();
-                }
-        }
+       if (lock->l_resource->lr_lvb_inode &&
+           lock->l_resource->lr_lvb_inode != data) {
+               struct inode *old_inode = lock->l_resource->lr_lvb_inode;
+               LASSERTF(old_inode->i_state & I_FREEING,
+                        "Found existing inode %p/%lu/%u state %lu in lock: "
+                        "setting data to %p/%lu/%u\n", old_inode,
+                        old_inode->i_ino, old_inode->i_generation,
+                        old_inode->i_state,
+                        new_inode, new_inode->i_ino, new_inode->i_generation);
+       }
 #endif
-        lock->l_ast_data = data;
+       lock->l_resource->lr_lvb_inode = new_inode;
+        if (bits)
+                *bits = lock->l_policy_data.l_inodebits.bits;
+
         unlock_res_and_lock(lock);
         LDLM_LOCK_PUT(lock);
 
-        EXIT;
-        return 0;
+        RETURN(0);
 }
-EXPORT_SYMBOL(mdc_set_lock_data);
 
-int mdc_change_cbdata(struct obd_export *exp, struct lustre_id *id, 
-                      ldlm_iterator_t it, void *data)
+ldlm_mode_t mdc_lock_match(struct obd_export *exp, __u64 flags,
+                           const struct lu_fid *fid, ldlm_type_t type,
+                           ldlm_policy_data_t *policy, ldlm_mode_t mode,
+                           struct lustre_handle *lockh)
 {
-        struct ldlm_res_id res_id = { .name = {0} };
+        struct ldlm_res_id res_id;
+        ldlm_mode_t rc;
         ENTRY;
 
-        res_id.name[0] = id_fid(id);
-        res_id.name[1] = id_group(id);
+        fid_build_reg_res_name(fid, &res_id);
+        rc = ldlm_lock_match(class_exp2obd(exp)->obd_namespace, flags,
+                             &res_id, type, policy, mode, lockh, 0);
+        RETURN(rc);
+}
+
+int mdc_cancel_unused(struct obd_export *exp,
+                      const struct lu_fid *fid,
+                      ldlm_policy_data_t *policy,
+                      ldlm_mode_t mode,
+                      ldlm_cancel_flags_t flags,
+                      void *opaque)
+{
+        struct ldlm_res_id res_id;
+        struct obd_device *obd = class_exp2obd(exp);
+        int rc;
 
-        ldlm_change_cbdata(class_exp2obd(exp)->obd_namespace,
-                           &res_id, it, data);
+        ENTRY;
 
-        EXIT;
-        return 0;
+        fid_build_reg_res_name(fid, &res_id);
+        rc = ldlm_cli_cancel_unused_resource(obd->obd_namespace, &res_id,
+                                             policy, mode, flags, opaque);
+        RETURN(rc);
+}
+
+int mdc_null_inode(struct obd_export *exp,
+                  const struct lu_fid *fid)
+{
+       struct ldlm_res_id res_id;
+       struct ldlm_resource *res;
+       struct ldlm_namespace *ns = class_exp2obd(exp)->obd_namespace;
+       ENTRY;
+
+       LASSERTF(ns != NULL, "no namespace passed\n");
+
+       fid_build_reg_res_name(fid, &res_id);
+
+       res = ldlm_resource_get(ns, NULL, &res_id, 0, 0);
+       if(res == NULL)
+               RETURN(0);
+
+       lock_res(res);
+       res->lr_lvb_inode = NULL;
+       unlock_res(res);
+
+       ldlm_resource_putref(res);
+       RETURN(0);
+}
+
+/* find any ldlm lock of the inode in mdc
+ * return 0    not find
+ *        1    find one
+ *      < 0    error */
+int mdc_find_cbdata(struct obd_export *exp,
+                    const struct lu_fid *fid,
+                    ldlm_iterator_t it, void *data)
+{
+        struct ldlm_res_id res_id;
+        int rc = 0;
+        ENTRY;
+
+        fid_build_reg_res_name((struct lu_fid*)fid, &res_id);
+        rc = ldlm_resource_iterate(class_exp2obd(exp)->obd_namespace, &res_id,
+                                   it, data);
+        if (rc == LDLM_ITER_STOP)
+                RETURN(1);
+        else if (rc == LDLM_ITER_CONTINUE)
+                RETURN(0);
+        RETURN(rc);
 }
 
-static inline void
-mdc_clear_replay_flag(struct ptlrpc_request *req, int rc)
+static inline void mdc_clear_replay_flag(struct ptlrpc_request *req, int rc)
 {
-        /* Don't hold error requests for replay. */
-        if (req->rq_replay) {
-                unsigned long irqflags;
-                spin_lock_irqsave(&req->rq_lock, irqflags);
-                req->rq_replay = 0;
-                spin_unlock_irqrestore(&req->rq_lock, irqflags);
+       /* Don't hold error requests for replay. */
+       if (req->rq_replay) {
+               spin_lock(&req->rq_lock);
+               req->rq_replay = 0;
+               spin_unlock(&req->rq_lock);
         }
         if (rc && req->rq_transno != 0) {
                 DEBUG_REQ(D_ERROR, req, "transno returned on error rc %d", rc);
@@ -199,266 +247,801 @@ mdc_clear_replay_flag(struct ptlrpc_request *req, int rc)
         }
 }
 
-/* We always reserve enough space in the reply packet for a stripe MD, because
- * we don't know in advance the file type. */
-int mdc_enqueue(struct obd_export *exp,
-                int lock_type,
-                struct lookup_intent *it,
-                int lock_mode,
-                struct mdc_op_data *data,
-                struct lustre_handle *lockh,
-                void *lmm,
-                int lmmsize,
-                ldlm_completion_callback cb_completion,
-                ldlm_blocking_callback cb_blocking,
-                void *cb_data)
+/* Save a large LOV EA into the request buffer so that it is available
+ * for replay.  We don't do this in the initial request because the
+ * original request doesn't need this buffer (at most it sends just the
+ * lov_mds_md) and it is a waste of RAM/bandwidth to send the empty
+ * buffer and may also be difficult to allocate and save a very large
+ * request buffer for each open. (bug 5707)
+ *
+ * OOM here may cause recovery failure if lmm is needed (only for the
+ * original open if the MDS crashed just when this client also OOM'd)
+ * but this is incredibly unlikely, and questionable whether the client
+ * could do MDS recovery under OOM anyways... */
+static void mdc_realloc_openmsg(struct ptlrpc_request *req,
+                                struct mdt_body *body)
+{
+        int     rc;
+
+        /* FIXME: remove this explicit offset. */
+        rc = sptlrpc_cli_enlarge_reqbuf(req, DLM_INTENT_REC_OFF + 4,
+                                        body->eadatasize);
+        if (rc) {
+                CERROR("Can't enlarge segment %d size to %d\n",
+                       DLM_INTENT_REC_OFF + 4, body->eadatasize);
+                body->valid &= ~OBD_MD_FLEASIZE;
+                body->eadatasize = 0;
+        }
+}
+
+static struct ptlrpc_request *mdc_intent_open_pack(struct obd_export *exp,
+                                                   struct lookup_intent *it,
+                                                   struct md_op_data *op_data,
+                                                   void *lmm, int lmmsize,
+                                                   void *cb_data)
 {
         struct ptlrpc_request *req;
-        struct ldlm_res_id res_id = {
-                .name = {id_fid(&data->id1), id_group(&data->id1)}
-        };
-        struct obd_device *obddev = class_exp2obd(exp);
-        ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_LOOKUP } };
-        struct ldlm_intent *lit;
-        struct ldlm_request *lockreq;
-        int reqsize[6] = {[MDS_REQ_SECDESC_OFF] = 0,
-                          [MDS_REQ_INTENT_LOCKREQ_OFF] = sizeof(*lockreq),
-                          [MDS_REQ_INTENT_IT_OFF] = sizeof(*lit)};
-        int repsize[5] = {sizeof(struct ldlm_reply),
-                          sizeof(struct mds_body),
-                          obddev->u.cli.cl_max_mds_easize};
-        int req_buffers = 3, reply_buffers = 0;
-        int rc, flags = LDLM_FL_HAS_INTENT;
-        struct ldlm_reply *dlm_rep = NULL;
-        void *eadata;
-        unsigned long irqflags;
+        struct obd_device     *obddev = class_exp2obd(exp);
+        struct ldlm_intent    *lit;
+        CFS_LIST_HEAD(cancels);
+        int                    count = 0;
+        int                    mode;
+        int                    rc;
         ENTRY;
 
-//        LDLM_DEBUG_NOLOCK("mdsintent=%s,name=%s,dir=%lu",
-//                          ldlm_it2str(it->it_op), it_name, it_inode->i_ino);
-
-        reqsize[0] = lustre_secdesc_size();
-
-        if (it->it_op & IT_OPEN) {
-                struct lustre_intent_data *lustre_data = 
-                                   (struct lustre_intent_data *) it->d.fs_data;  
-                it->it_create_mode |= S_IFREG;
-                it->it_create_mode &= ~current->fs->umask;
-
-                reqsize[req_buffers++] = sizeof(struct mds_rec_create);
-                reqsize[req_buffers++] = data->namelen + 1;
-                reqsize[req_buffers++] = obddev->u.cli.cl_max_mds_easize;
-                /*pack the lustre key*/
-                if (lustre_data->it_key_size > 0 && lustre_data->it_key)
-                        reqsize[req_buffers++] = lustre_data->it_key_size; 
-                
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION,
-                                      LDLM_ENQUEUE, req_buffers, reqsize, NULL);
-                if (!req)
-                        RETURN(-ENOMEM);
-
-                spin_lock_irqsave (&req->rq_lock, irqflags);
-                req->rq_replay = 1;
-                spin_unlock_irqrestore (&req->rq_lock, irqflags);
-
-                /* pack the intent */
-                lit = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_INTENT_IT_OFF,
-                                     sizeof (*lit));
-                lit->opc = (__u64)it->it_op;
-
-                /* pack the intended request */
-                mdc_open_pack(req->rq_reqmsg, MDS_REQ_INTENT_REC_OFF, data,
-                              it->it_create_mode, 0, it->it_flags, lmm, lmmsize,
-                              lustre_data->it_key, lustre_data->it_key_size);
-                /* get ready for the reply */
-                reply_buffers = 3;
-                repsize[reply_buffers++] = sizeof(int);
-                repsize[reply_buffers++] = xattr_acl_size(LL_ACL_MAX_ENTRIES);
-                repsize[reply_buffers++] = sizeof(int);
-                repsize[reply_buffers++] = sizeof(struct crypto_key);
-                req->rq_replen = lustre_msg_size(reply_buffers, repsize);
-        } else if (it->it_op & (IT_GETATTR | IT_LOOKUP | IT_CHDIR)) {
-                __u64 valid = data->valid | OBD_MD_FLNOTOBD | OBD_MD_FLEASIZE |
-                            OBD_MD_FLACL | OBD_MD_FLKEY;
-
-                /* we don't expect xattr retrieve could reach here */
-                LASSERT(!(valid & (OBD_MD_FLXATTR | OBD_MD_FLXATTRLIST)));
-
-                reqsize[req_buffers++] = sizeof(struct mds_body);
-                reqsize[req_buffers++] = data->namelen + 1;
-
-                if (it->it_op & IT_GETATTR)
-                        policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
+        it->it_create_mode = (it->it_create_mode & ~S_IFMT) | S_IFREG;
 
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION,
-                                      LDLM_ENQUEUE, req_buffers, reqsize, NULL);
-
-                if (!req)
-                        RETURN(-ENOMEM);
-
-                /* pack the intent */
-                lit = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_INTENT_IT_OFF,
-                                     sizeof (*lit));
-                lit->opc = (__u64)it->it_op;
-
-                /* pack the intended request */
-                mdc_getattr_pack(req->rq_reqmsg, MDS_REQ_INTENT_REC_OFF,
-                                 valid, it->it_flags, data);
-                
-                /* get ready for the reply */
-                reply_buffers = 3;
-                repsize[reply_buffers++] = sizeof(int);
-                repsize[reply_buffers++] = xattr_acl_size(LL_ACL_MAX_ENTRIES);
-                repsize[reply_buffers++] = sizeof(int);
-                repsize[reply_buffers++] = sizeof(struct crypto_key);
-                req->rq_replen = lustre_msg_size(reply_buffers, repsize);
-        } else if (it->it_op == IT_READDIR) {
-                policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION,
-                                      LDLM_ENQUEUE, 2, reqsize, NULL);
-                
-                if (!req)
-                        RETURN(-ENOMEM);
-                /* get ready for the reply */
-                reply_buffers = 1;
-                req->rq_replen = lustre_msg_size(1, repsize);
-        } else if (it->it_op == IT_UNLINK) {
-                reqsize[req_buffers++] = sizeof(struct mds_body);
-                policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION,
-                                      LDLM_ENQUEUE, req_buffers, reqsize, NULL);
-                if (!req)
-                        RETURN(-ENOMEM);
-
-                /* pack the intended request */
-                mdc_getattr_pack(req->rq_reqmsg, MDS_REQ_INTENT_REC_OFF,
-                                 0, 0, data);
-
-                /* pack the intent */
-                lit = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_INTENT_IT_OFF,
-                                     sizeof (*lit));
-                lit->opc = (__u64)it->it_op;
-
-                /* get ready for the reply */
-                reply_buffers = 3;
-                req->rq_replen = lustre_msg_size(3, repsize);
-        } else {
-                LBUG();
-                RETURN(-EINVAL);
+        /* XXX: openlock is not cancelled for cross-refs. */
+        /* If inode is known, cancel conflicting OPEN locks. */
+        if (fid_is_sane(&op_data->op_fid2)) {
+                if (it->it_flags & (FMODE_WRITE|MDS_OPEN_TRUNC))
+                        mode = LCK_CW;
+#ifdef FMODE_EXEC
+                else if (it->it_flags & FMODE_EXEC)
+                        mode = LCK_PR;
+#endif
+                else
+                        mode = LCK_CR;
+                count = mdc_resource_get_unused(exp, &op_data->op_fid2,
+                                                &cancels, mode,
+                                                MDS_INODELOCK_OPEN);
         }
 
-        lustre_pack_secdesc(req, reqsize[0]);
+        /* If CREATE, cancel parent's UPDATE lock. */
+        if (it->it_op & IT_CREAT)
+                mode = LCK_EX;
+        else
+                mode = LCK_CR;
+        count += mdc_resource_get_unused(exp, &op_data->op_fid1,
+                                         &cancels, mode,
+                                         MDS_INODELOCK_UPDATE);
+
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp),
+                                   &RQF_LDLM_INTENT_OPEN);
+        if (req == NULL) {
+                ldlm_lock_list_put(&cancels, l_bl_ast, count);
+                RETURN(ERR_PTR(-ENOMEM));
+        }
 
-        mdc_get_rpc_lock(obddev->u.cli.cl_rpc_lock, it);
-        rc = ldlm_cli_enqueue(exp, req, obddev->obd_namespace, res_id,
-                              lock_type, &policy, lock_mode, &flags,cb_blocking,
-                              cb_completion, NULL, cb_data, NULL, 0, NULL,
-                              lockh);
-        mdc_put_rpc_lock(obddev->u.cli.cl_rpc_lock, it);
+        /* parent capability */
+        mdc_set_capa_size(req, &RMF_CAPA1, op_data->op_capa1);
+        /* child capability, reserve the size according to parent capa, it will
+         * be filled after we get the reply */
+        mdc_set_capa_size(req, &RMF_CAPA2, 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,
+                             max(lmmsize, obddev->u.cli.cl_default_mds_easize));
+
+        rc = ldlm_prep_enqueue_req(exp, req, &cancels, count);
+        if (rc) {
+                ptlrpc_request_free(req);
+                return NULL;
+        }
+
+       spin_lock(&req->rq_lock);
+       req->rq_replay = req->rq_import->imp_replayable;
+       spin_unlock(&req->rq_lock);
+
+        /* pack the intent */
+        lit = req_capsule_client_get(&req->rq_pill, &RMF_LDLM_INTENT);
+        lit->opc = (__u64)it->it_op;
+
+        /* pack the intended request */
+        mdc_open_pack(req, op_data, it->it_create_mode, 0, it->it_flags, lmm,
+                      lmmsize);
+
+        /* for remote client, fetch remote perm for current user */
+        if (client_is_remote(exp))
+                req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER,
+                                     sizeof(struct mdt_remote_perm));
+        ptlrpc_request_set_replen(req);
+        return req;
+}
+
+static struct ptlrpc_request *mdc_intent_unlink_pack(struct obd_export *exp,
+                                                     struct lookup_intent *it,
+                                                     struct md_op_data *op_data)
+{
+        struct ptlrpc_request *req;
+        struct obd_device     *obddev = class_exp2obd(exp);
+        struct ldlm_intent    *lit;
+        int                    rc;
+        ENTRY;
+
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp),
+                                   &RQF_LDLM_INTENT_UNLINK);
+        if (req == NULL)
+                RETURN(ERR_PTR(-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 = ldlm_prep_enqueue_req(exp, req, NULL, 0);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(ERR_PTR(rc));
+        }
 
+        /* pack the intent */
+        lit = req_capsule_client_get(&req->rq_pill, &RMF_LDLM_INTENT);
+        lit->opc = (__u64)it->it_op;
+
+        /* pack the intended request */
+        mdc_unlink_pack(req, op_data);
+
+        req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
+                             obddev->u.cli.cl_max_mds_easize);
+        req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER,
+                             obddev->u.cli.cl_max_mds_cookiesize);
+        ptlrpc_request_set_replen(req);
+        RETURN(req);
+}
+
+static struct ptlrpc_request *mdc_intent_getattr_pack(struct obd_export *exp,
+                                                      struct lookup_intent *it,
+                                                      struct md_op_data *op_data)
+{
+        struct ptlrpc_request *req;
+        struct obd_device     *obddev = class_exp2obd(exp);
+        obd_valid              valid = OBD_MD_FLGETATTR | OBD_MD_FLEASIZE |
+                                       OBD_MD_FLMODEASIZE | OBD_MD_FLDIREA |
+                                       OBD_MD_FLMDSCAPA | OBD_MD_MEA |
+                                       (client_is_remote(exp) ?
+                                               OBD_MD_FLRMTPERM : OBD_MD_FLACL);
+        struct ldlm_intent    *lit;
+        int                    rc;
+        ENTRY;
+
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp),
+                                   &RQF_LDLM_INTENT_GETATTR);
+        if (req == NULL)
+                RETURN(ERR_PTR(-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 = ldlm_prep_enqueue_req(exp, req, NULL, 0);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(ERR_PTR(rc));
+        }
+
+        /* pack the intent */
+        lit = req_capsule_client_get(&req->rq_pill, &RMF_LDLM_INTENT);
+        lit->opc = (__u64)it->it_op;
+
+        /* pack the intended request */
+        mdc_getattr_pack(req, valid, it->it_flags, op_data,
+                         obddev->u.cli.cl_max_mds_easize);
+
+        req_capsule_set_size(&req->rq_pill, &RMF_MDT_MD, RCL_SERVER,
+                             obddev->u.cli.cl_max_mds_easize);
+        if (client_is_remote(exp))
+                req_capsule_set_size(&req->rq_pill, &RMF_ACL, RCL_SERVER,
+                                     sizeof(struct mdt_remote_perm));
+        ptlrpc_request_set_replen(req);
+        RETURN(req);
+}
+
+static struct ptlrpc_request *mdc_intent_layout_pack(struct obd_export *exp,
+                                                    struct lookup_intent *it,
+                                                    struct md_op_data *unused)
+{
+       struct obd_device     *obd = class_exp2obd(exp);
+       struct ptlrpc_request *req;
+       struct ldlm_intent    *lit;
+       struct layout_intent  *layout;
+       int rc;
+       ENTRY;
+
+       req = ptlrpc_request_alloc(class_exp2cliimp(exp),
+                               &RQF_LDLM_INTENT_LAYOUT);
+       if (req == NULL)
+               RETURN(ERR_PTR(-ENOMEM));
+
+       req_capsule_set_size(&req->rq_pill, &RMF_EADATA, RCL_CLIENT, 0);
+       rc = ldlm_prep_enqueue_req(exp, req, NULL, 0);
+       if (rc) {
+               ptlrpc_request_free(req);
+               RETURN(ERR_PTR(rc));
+       }
+
+       /* pack the intent */
+       lit = req_capsule_client_get(&req->rq_pill, &RMF_LDLM_INTENT);
+       lit->opc = (__u64)it->it_op;
+
+       /* pack the layout intent request */
+       layout = req_capsule_client_get(&req->rq_pill, &RMF_LAYOUT_INTENT);
+       /* LAYOUT_INTENT_ACCESS is generic, specific operation will be
+        * set for replication */
+       layout->li_opc = LAYOUT_INTENT_ACCESS;
+
+       req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_SERVER,
+                       obd->u.cli.cl_max_mds_easize);
+       ptlrpc_request_set_replen(req);
+       RETURN(req);
+}
+
+static struct ptlrpc_request *
+mdc_enqueue_pack(struct obd_export *exp, int lvb_len)
+{
+        struct ptlrpc_request *req;
+        int rc;
+        ENTRY;
+
+        req = ptlrpc_request_alloc(class_exp2cliimp(exp), &RQF_LDLM_ENQUEUE);
+        if (req == NULL)
+                RETURN(ERR_PTR(-ENOMEM));
+
+        rc = ldlm_prep_enqueue_req(exp, req, NULL, 0);
+        if (rc) {
+                ptlrpc_request_free(req);
+                RETURN(ERR_PTR(rc));
+        }
+
+       req_capsule_set_size(&req->rq_pill, &RMF_DLM_LVB, RCL_SERVER, lvb_len);
+        ptlrpc_request_set_replen(req);
+        RETURN(req);
+}
+
+static int mdc_finish_enqueue(struct obd_export *exp,
+                              struct ptlrpc_request *req,
+                              struct ldlm_enqueue_info *einfo,
+                              struct lookup_intent *it,
+                              struct lustre_handle *lockh,
+                              int rc)
+{
+       struct req_capsule  *pill = &req->rq_pill;
+       struct ldlm_request *lockreq;
+       struct ldlm_reply   *lockrep;
+       struct lustre_intent_data *intent = &it->d.lustre;
+       struct ldlm_lock    *lock;
+       void                *lvb_data = NULL;
+       int                  lvb_len = 0;
+        ENTRY;
+
+        LASSERT(rc >= 0);
         /* Similarly, if we're going to replay this request, we don't want to
          * actually get a lock, just perform the intent. */
         if (req->rq_transno || req->rq_replay) {
-                lockreq = lustre_msg_buf(req->rq_reqmsg,
-                                         MDS_REQ_INTENT_LOCKREQ_OFF,
-                                         sizeof (*lockreq));
-                lockreq->lock_flags |= LDLM_FL_INTENT_ONLY;
+                lockreq = req_capsule_client_get(pill, &RMF_DLM_REQ);
+               lockreq->lock_flags |= ldlm_flags_to_wire(LDLM_FL_INTENT_ONLY);
         }
 
-        /* This can go when we're sure that this can never happen */
-        LASSERT(rc != -ENOENT);
-        /* We need dlm_rep to be assigned this early, to check lock mode of
-           returned lock from request to avoid possible race with lock
-           conversion */
-        if (rc == ELDLM_LOCK_ABORTED || !rc) {
-                dlm_rep = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*dlm_rep));
-                LASSERT(dlm_rep != NULL);   /* checked by ldlm_cli_enqueue() */
-        }
         if (rc == ELDLM_LOCK_ABORTED) {
-                lock_mode = 0;
+                einfo->ei_mode = 0;
                 memset(lockh, 0, sizeof(*lockh));
                 rc = 0;
-        } else if (rc != 0) {
-                CERROR("ldlm_cli_enqueue: %d\n", rc);
-                LASSERTF(rc < 0, "rc = %d\n", rc);
-                mdc_clear_replay_flag(req, rc);
-                ptlrpc_req_finished(req);
-                RETURN(rc);
         } else { /* rc = 0 */
-                struct ldlm_lock *lock = ldlm_handle2lock(lockh);
-                LASSERT(lock);
+               lock = ldlm_handle2lock(lockh);
+               LASSERT(lock != NULL);
 
                 /* If the server gave us back a different lock mode, we should
                  * fix up our variables. */
-                if (dlm_rep->lock_desc.l_req_mode != lock_mode) {
-                        ldlm_lock_addref(lockh, dlm_rep->lock_desc.l_req_mode);
-                        ldlm_lock_decref(lockh, lock_mode);
-                        lock_mode = dlm_rep->lock_desc.l_req_mode;
+                if (lock->l_req_mode != einfo->ei_mode) {
+                        ldlm_lock_addref(lockh, lock->l_req_mode);
+                        ldlm_lock_decref(lockh, einfo->ei_mode);
+                        einfo->ei_mode = lock->l_req_mode;
                 }
+               LDLM_LOCK_PUT(lock);
+       }
 
-                ldlm_lock_allow_match(lock);
-                LDLM_LOCK_PUT(lock);
-        }
+       lockrep = req_capsule_server_get(pill, &RMF_DLM_REP);
+       LASSERT(lockrep != NULL); /* checked by ldlm_cli_enqueue() */
 
-        LASSERT_REPSWABBED(req, 0);         /* swabbed by ldlm_cli_enqueue() */
+       intent->it_disposition = (int)lockrep->lock_policy_res1;
+       intent->it_status = (int)lockrep->lock_policy_res2;
+       intent->it_lock_mode = einfo->ei_mode;
+       intent->it_lock_handle = lockh->cookie;
+       intent->it_data = req;
 
-        LUSTRE_IT(it)->it_disposition = (int) dlm_rep->lock_policy_res1;
-        LUSTRE_IT(it)->it_status = (int) dlm_rep->lock_policy_res2;
-        LUSTRE_IT(it)->it_lock_mode = lock_mode;
-        LUSTRE_IT(it)->it_data = req;
+       /* Technically speaking rq_transno must already be zero if
+        * it_status is in error, so the check is a bit redundant */
+       if ((!req->rq_transno || intent->it_status < 0) && req->rq_replay)
+               mdc_clear_replay_flag(req, intent->it_status);
 
-        if (LUSTRE_IT(it)->it_status < 0 && req->rq_replay)
-                mdc_clear_replay_flag(req, LUSTRE_IT(it)->it_status);
+        /* If we're doing an IT_OPEN which did not result in an actual
+         * successful open, then we need to remove the bit which saves
+         * this request for unconditional replay.
+         *
+         * It's important that we do this first!  Otherwise we might exit the
+         * function without doing so, and try to replay a failed create
+         * (bug 3440) */
+        if (it->it_op & IT_OPEN && req->rq_replay &&
+           (!it_disposition(it, DISP_OPEN_OPEN) ||intent->it_status != 0))
+               mdc_clear_replay_flag(req, intent->it_status);
 
-        DEBUG_REQ(D_DLMTRACE, req, "disposition: %x, status: %d",
-                  LUSTRE_IT(it)->it_disposition, LUSTRE_IT(it)->it_status);
+       DEBUG_REQ(D_RPCTRACE, req, "op: %d disposition: %x, status: %d",
+                 it->it_op, intent->it_disposition, intent->it_status);
 
         /* We know what to expect, so we do any byte flipping required here */
-        LASSERT(reply_buffers == 5 || reply_buffers == 4 || 
-                reply_buffers == 3 || reply_buffers == 1 || 
-                reply_buffers == 6 || reply_buffers == 7);
-        if (reply_buffers >= 3) {
-                struct mds_body *body;
-
-                body = lustre_swab_repbuf(req, 1, sizeof (*body),
-                                          lustre_swab_mds_body);
+        if (it->it_op & (IT_OPEN | IT_UNLINK | IT_LOOKUP | IT_GETATTR)) {
+                struct mdt_body *body;
+
+                body = req_capsule_server_get(pill, &RMF_MDT_BODY);
                 if (body == NULL) {
-                        CERROR ("Can't swab mds_body\n");
+                        CERROR ("Can't swab mdt_body\n");
                         RETURN (-EPROTO);
                 }
 
-                if ((body->valid & OBD_MD_FLEASIZE) != 0) {
-                        /* The eadata is opaque; just check that it is there.
-                         * Eventually, obd_unpackmd() will check the contents */
-                        eadata = lustre_swab_repbuf(req, 2, body->eadatasize,
-                                                    NULL);
-                        if (eadata == NULL) {
-                                CERROR ("Missing/short eadata\n");
-                                RETURN (-EPROTO);
+                if (it_disposition(it, DISP_OPEN_OPEN) &&
+                    !it_open_error(DISP_OPEN_OPEN, it)) {
+                        /*
+                         * If this is a successful OPEN request, we need to set
+                         * replay handler and data early, so that if replay
+                         * happens immediately after swabbing below, new reply
+                         * is swabbed by that handler correctly.
+                         */
+                        mdc_set_open_replay_data(NULL, NULL, req);
+               }
+
+                if ((body->valid & (OBD_MD_FLDIREA | OBD_MD_FLEASIZE)) != 0) {
+                        void *eadata;
+
+                       mdc_update_max_ea_from_body(exp, body);
+
+                        /*
+                         * The eadata is opaque; just check that it is there.
+                         * Eventually, obd_unpackmd() will check the contents.
+                         */
+                        eadata = req_capsule_server_sized_get(pill, &RMF_MDT_MD,
+                                                              body->eadatasize);
+                        if (eadata == NULL)
+                                RETURN(-EPROTO);
+
+                       /* save lvb data and length in case this is for layout
+                        * lock */
+                       lvb_data = eadata;
+                       lvb_len = body->eadatasize;
+
+                        /*
+                         * We save the reply LOV EA in case we have to replay a
+                         * create for recovery.  If we didn't allocate a large
+                         * enough request buffer above we need to reallocate it
+                         * here to hold the actual LOV EA.
+                         *
+                         * To not save LOV EA if request is not going to replay
+                         * (for example error one).
+                         */
+                        if ((it->it_op & IT_OPEN) && req->rq_replay) {
+                                void *lmm;
+                                if (req_capsule_get_size(pill, &RMF_EADATA,
+                                                         RCL_CLIENT) <
+                                    body->eadatasize)
+                                        mdc_realloc_openmsg(req, body);
+                                else
+                                        req_capsule_shrink(pill, &RMF_EADATA,
+                                                           body->eadatasize,
+                                                           RCL_CLIENT);
+
+                                req_capsule_set_size(pill, &RMF_EADATA,
+                                                     RCL_CLIENT,
+                                                     body->eadatasize);
+
+                                lmm = req_capsule_client_get(pill, &RMF_EADATA);
+                                if (lmm)
+                                        memcpy(lmm, eadata, body->eadatasize);
                         }
+                }
+
+                if (body->valid & OBD_MD_FLRMTPERM) {
+                        struct mdt_remote_perm *perm;
+
+                        LASSERT(client_is_remote(exp));
+                        perm = req_capsule_server_swab_get(pill, &RMF_ACL,
+                                                lustre_swab_mdt_remote_perm);
+                        if (perm == NULL)
+                                RETURN(-EPROTO);
+                }
+                if (body->valid & OBD_MD_FLMDSCAPA) {
+                        struct lustre_capa *capa, *p;
+
+                        capa = req_capsule_server_get(pill, &RMF_CAPA1);
+                        if (capa == NULL)
+                                RETURN(-EPROTO);
+
                         if (it->it_op & IT_OPEN) {
-                                void *replayea;
-
-                                replayea = lustre_msg_buf(req->rq_reqmsg,
-                                                          MDS_REQ_INTENT_REC_OFF + 2,
-                                                          body->eadatasize);
-                                LASSERT(replayea);
-                                memcpy(replayea, eadata, body->eadatasize);
-
-                                LASSERT(req->rq_reqmsg->bufcount == 6 || 
-                                        req->rq_reqmsg->bufcount == 7);
-                                req->rq_reqmsg->buflens[5] = body->eadatasize;
-                                /* If this isn't the last buffer, we might
-                                 * have to shift other data around. */
+                                /* client fid capa will be checked in replay */
+                                p = req_capsule_client_get(pill, &RMF_CAPA2);
+                                LASSERT(p);
+                                *p = *capa;
                         }
                 }
+                if (body->valid & OBD_MD_FLOSSCAPA) {
+                        struct lustre_capa *capa;
+
+                        capa = req_capsule_server_get(pill, &RMF_CAPA2);
+                        if (capa == NULL)
+                                RETURN(-EPROTO);
+                }
+        } else if (it->it_op & IT_LAYOUT) {
+               /* maybe the lock was granted right away and layout
+                * is packed into RMF_DLM_LVB of req */
+               lvb_len = req_capsule_get_size(pill, &RMF_DLM_LVB, RCL_SERVER);
+               if (lvb_len > 0) {
+                       lvb_data = req_capsule_server_sized_get(pill,
+                                                       &RMF_DLM_LVB, lvb_len);
+                       if (lvb_data == NULL)
+                               RETURN(-EPROTO);
+               }
+       }
+
+       /* fill in stripe data for layout lock */
+       lock = ldlm_handle2lock(lockh);
+       if (lock != NULL && ldlm_has_layout(lock) && lvb_data != NULL) {
+               void *lmm;
+
+               LDLM_DEBUG(lock, "layout lock returned by: %s, lvb_len: %d\n",
+                       ldlm_it2str(it->it_op), lvb_len);
+
+               OBD_ALLOC_LARGE(lmm, lvb_len);
+               if (lmm == NULL) {
+                       LDLM_LOCK_PUT(lock);
+                       RETURN(-ENOMEM);
+               }
+               memcpy(lmm, lvb_data, lvb_len);
+
+               /* install lvb_data */
+               lock_res_and_lock(lock);
+               if (lock->l_lvb_data == NULL) {
+                       lock->l_lvb_data = lmm;
+                       lock->l_lvb_len = lvb_len;
+                       lmm = NULL;
+               }
+               unlock_res_and_lock(lock);
+               if (lmm != NULL)
+                       OBD_FREE_LARGE(lmm, lvb_len);
+       }
+       if (lock != NULL)
+               LDLM_LOCK_PUT(lock);
+
+       RETURN(rc);
+}
+
+/* We always reserve enough space in the reply packet for a stripe MD, because
+ * we don't know in advance the file type. */
+int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
+                struct lookup_intent *it, struct md_op_data *op_data,
+                struct lustre_handle *lockh, void *lmm, int lmmsize,
+               struct ptlrpc_request **reqp, __u64 extra_lock_flags)
+{
+        struct obd_device     *obddev = class_exp2obd(exp);
+        struct ptlrpc_request *req = NULL;
+       __u64                  flags, saved_flags = extra_lock_flags;
+        int                    rc;
+        struct ldlm_res_id res_id;
+        static const ldlm_policy_data_t lookup_policy =
+                            { .l_inodebits = { MDS_INODELOCK_LOOKUP } };
+        static const ldlm_policy_data_t update_policy =
+                            { .l_inodebits = { MDS_INODELOCK_UPDATE } };
+       static const ldlm_policy_data_t layout_policy =
+                           { .l_inodebits = { MDS_INODELOCK_LAYOUT } };
+        ldlm_policy_data_t const *policy = &lookup_policy;
+        int                    generation, resends = 0;
+        struct ldlm_reply     *lockrep;
+       enum lvb_type          lvb_type = 0;
+        ENTRY;
+
+        LASSERTF(!it || einfo->ei_type == LDLM_IBITS, "lock type %d\n",
+                 einfo->ei_type);
+
+        fid_build_reg_res_name(&op_data->op_fid1, &res_id);
+
+       if (it) {
+               saved_flags |= LDLM_FL_HAS_INTENT;
+               if (it->it_op & (IT_UNLINK | IT_GETATTR | IT_READDIR))
+                       policy = &update_policy;
+               else if (it->it_op & IT_LAYOUT)
+                       policy = &layout_policy;
+       }
+
+        LASSERT(reqp == NULL);
+
+        generation = obddev->u.cli.cl_import->imp_generation;
+resend:
+        flags = saved_flags;
+        if (!it) {
+                /* The only way right now is FLOCK, in this case we hide flock
+                   policy as lmm, but lmmsize is 0 */
+                LASSERT(lmm && lmmsize == 0);
+                LASSERTF(einfo->ei_type == LDLM_FLOCK, "lock type %d\n",
+                         einfo->ei_type);
+                policy = (ldlm_policy_data_t *)lmm;
+                res_id.name[3] = LDLM_FLOCK;
+        } else if (it->it_op & IT_OPEN) {
+                req = mdc_intent_open_pack(exp, it, op_data, lmm, lmmsize,
+                                           einfo->ei_cbdata);
+                policy = &update_policy;
+                einfo->ei_cbdata = NULL;
+                lmm = NULL;
+       } else if (it->it_op & IT_UNLINK) {
+               req = mdc_intent_unlink_pack(exp, it, op_data);
+       } else if (it->it_op & (IT_GETATTR | IT_LOOKUP)) {
+               req = mdc_intent_getattr_pack(exp, it, op_data);
+       } else if (it->it_op & IT_READDIR) {
+               req = mdc_enqueue_pack(exp, 0);
+       } else if (it->it_op & IT_LAYOUT) {
+               if (!imp_connect_lvb_type(class_exp2cliimp(exp)))
+                       RETURN(-EOPNOTSUPP);
+
+               req = mdc_intent_layout_pack(exp, it, op_data);
+               lvb_type = LVB_T_LAYOUT;
+       } else {
+                LBUG();
+                RETURN(-EINVAL);
         }
 
+        if (IS_ERR(req))
+                RETURN(PTR_ERR(req));
+
+       if (req != NULL && it && it->it_op & IT_CREAT)
+               /* ask ptlrpc not to resend on EINPROGRESS since we have our own
+                * retry logic */
+               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;
+        }
+
+        /* It is important to obtain rpc_lock first (if applicable), so that
+         * threads that are serialised with rpc_lock are not polluting our
+         * rpcs in flight counter. We do not do flock request limiting, though*/
+        if (it) {
+                mdc_get_rpc_lock(obddev->u.cli.cl_rpc_lock, it);
+                rc = mdc_enter_request(&obddev->u.cli);
+                if (rc != 0) {
+                        mdc_put_rpc_lock(obddev->u.cli.cl_rpc_lock, it);
+                        mdc_clear_replay_flag(req, 0);
+                        ptlrpc_req_finished(req);
+                        RETURN(rc);
+                }
+        }
+
+        rc = ldlm_cli_enqueue(exp, &req, einfo, &res_id, policy, &flags, NULL,
+                             0, lvb_type, lockh, 0);
+        if (!it) {
+                /* For flock requests we immediatelly return without further
+                   delay and let caller deal with the rest, since rest of
+                   this function metadata processing makes no sense for flock
+                   requests anyway */
+                RETURN(rc);
+        }
+
+        mdc_exit_request(&obddev->u.cli);
+        mdc_put_rpc_lock(obddev->u.cli.cl_rpc_lock, it);
+
+        if (rc < 0) {
+                CERROR("ldlm_cli_enqueue: %d\n", rc);
+                mdc_clear_replay_flag(req, rc);
+                ptlrpc_req_finished(req);
+                RETURN(rc);
+        }
+
+        lockrep = req_capsule_server_get(&req->rq_pill, &RMF_DLM_REP);
+        LASSERT(lockrep != NULL);
+
+       lockrep->lock_policy_res2 =
+               ptlrpc_status_ntoh(lockrep->lock_policy_res2);
+
+        /* Retry the create infinitely when we get -EINPROGRESS from
+         * server. This is required by the new quota design. */
+        if (it && it->it_op & IT_CREAT &&
+            (int)lockrep->lock_policy_res2 == -EINPROGRESS) {
+                mdc_clear_replay_flag(req, rc);
+                ptlrpc_req_finished(req);
+                resends++;
+
+                CDEBUG(D_HA, "%s: resend:%d op:%d "DFID"/"DFID"\n",
+                       obddev->obd_name, resends, it->it_op,
+                       PFID(&op_data->op_fid1), PFID(&op_data->op_fid2));
+
+                if (generation == obddev->u.cli.cl_import->imp_generation) {
+                        goto resend;
+                } else {
+                       CDEBUG(D_HA, "resend cross eviction\n");
+                        RETURN(-EIO);
+                }
+        }
+
+       rc = mdc_finish_enqueue(exp, req, einfo, it, lockh, rc);
+       if (rc < 0) {
+               if (lustre_handle_is_used(lockh)) {
+                       ldlm_lock_decref(lockh, einfo->ei_mode);
+                       memset(lockh, 0, sizeof(*lockh));
+               }
+               ptlrpc_req_finished(req);
+       }
+       RETURN(rc);
+}
+
+static int mdc_finish_intent_lock(struct obd_export *exp,
+                                  struct ptlrpc_request *request,
+                                  struct md_op_data *op_data,
+                                  struct lookup_intent *it,
+                                  struct lustre_handle *lockh)
+{
+        struct lustre_handle old_lock;
+        struct mdt_body *mdt_body;
+        struct ldlm_lock *lock;
+        int rc;
+       ENTRY;
+
+        LASSERT(request != NULL);
+        LASSERT(request != LP_POISON);
+        LASSERT(request->rq_repmsg != LP_POISON);
+
+        if (!it_disposition(it, DISP_IT_EXECD)) {
+                /* The server failed before it even started executing the
+                 * intent, i.e. because it couldn't unpack the request. */
+                LASSERT(it->d.lustre.it_status != 0);
+                RETURN(it->d.lustre.it_status);
+        }
+        rc = it_open_error(DISP_IT_EXECD, it);
+        if (rc)
+                RETURN(rc);
+
+        mdt_body = req_capsule_server_get(&request->rq_pill, &RMF_MDT_BODY);
+        LASSERT(mdt_body != NULL);      /* mdc_enqueue checked */
+
+        /* If we were revalidating a fid/name pair, mark the intent in
+         * case we fail and get called again from lookup */
+        if (fid_is_sane(&op_data->op_fid2) &&
+            it->it_create_mode & M_CHECK_STALE &&
+            it->it_op != IT_GETATTR) {
+                it_set_disposition(it, DISP_ENQ_COMPLETE);
+
+                /* Also: did we find the same inode? */
+                /* sever can return one of two fids:
+                 * op_fid2 - new allocated fid - if file is created.
+                 * op_fid3 - existent fid - if file only open.
+                 * op_fid3 is saved in lmv_intent_open */
+                if ((!lu_fid_eq(&op_data->op_fid2, &mdt_body->fid1)) &&
+                    (!lu_fid_eq(&op_data->op_fid3, &mdt_body->fid1))) {
+                        CDEBUG(D_DENTRY, "Found stale data "DFID"("DFID")/"DFID
+                               "\n", PFID(&op_data->op_fid2),
+                               PFID(&op_data->op_fid2), PFID(&mdt_body->fid1));
+                        RETURN(-ESTALE);
+                }
+        }
+
+        rc = it_open_error(DISP_LOOKUP_EXECD, it);
+        if (rc)
+                RETURN(rc);
+
+        /* keep requests around for the multiple phases of the call
+         * this shows the DISP_XX must guarantee we make it into the call
+         */
+        if (!it_disposition(it, DISP_ENQ_CREATE_REF) &&
+            it_disposition(it, DISP_OPEN_CREATE) &&
+            !it_open_error(DISP_OPEN_CREATE, it)) {
+                it_set_disposition(it, DISP_ENQ_CREATE_REF);
+                ptlrpc_request_addref(request); /* balanced in ll_create_node */
+        }
+        if (!it_disposition(it, DISP_ENQ_OPEN_REF) &&
+            it_disposition(it, DISP_OPEN_OPEN) &&
+            !it_open_error(DISP_OPEN_OPEN, it)) {
+                it_set_disposition(it, DISP_ENQ_OPEN_REF);
+                ptlrpc_request_addref(request); /* balanced in ll_file_open */
+                /* BUG 11546 - eviction in the middle of open rpc processing */
+                OBD_FAIL_TIMEOUT(OBD_FAIL_MDC_ENQUEUE_PAUSE, obd_timeout);
+        }
+
+        if (it->it_op & IT_CREAT) {
+                /* XXX this belongs in ll_create_it */
+        } else if (it->it_op == IT_OPEN) {
+                LASSERT(!it_disposition(it, DISP_OPEN_CREATE));
+        } else {
+                LASSERT(it->it_op & (IT_GETATTR | IT_LOOKUP | IT_LAYOUT));
+        }
+
+        /* If we already have a matching lock, then cancel the new
+         * one.  We have to set the data here instead of in
+         * mdc_enqueue, because we need to use the child's inode as
+         * the l_ast_data to match, and that's not available until
+         * intent_finish has performed the iget().) */
+        lock = ldlm_handle2lock(lockh);
+        if (lock) {
+                ldlm_policy_data_t policy = lock->l_policy_data;
+                LDLM_DEBUG(lock, "matching against this");
+
+                LASSERTF(fid_res_name_eq(&mdt_body->fid1,
+                                         &lock->l_resource->lr_name),
+                         "Lock res_id: %lu/%lu/%lu, fid: %lu/%lu/%lu.\n",
+                         (unsigned long)lock->l_resource->lr_name.name[0],
+                         (unsigned long)lock->l_resource->lr_name.name[1],
+                         (unsigned long)lock->l_resource->lr_name.name[2],
+                         (unsigned long)fid_seq(&mdt_body->fid1),
+                         (unsigned long)fid_oid(&mdt_body->fid1),
+                         (unsigned long)fid_ver(&mdt_body->fid1));
+                LDLM_LOCK_PUT(lock);
+
+                memcpy(&old_lock, lockh, sizeof(*lockh));
+                if (ldlm_lock_match(NULL, LDLM_FL_BLOCK_GRANTED, NULL,
+                                    LDLM_IBITS, &policy, LCK_NL, &old_lock, 0)) {
+                        ldlm_lock_decref_and_cancel(lockh,
+                                                    it->d.lustre.it_lock_mode);
+                        memcpy(lockh, &old_lock, sizeof(old_lock));
+                        it->d.lustre.it_lock_handle = lockh->cookie;
+                }
+        }
+        CDEBUG(D_DENTRY,"D_IT dentry %.*s intent: %s status %d disp %x rc %d\n",
+               op_data->op_namelen, op_data->op_name, ldlm_it2str(it->it_op),
+               it->d.lustre.it_status, it->d.lustre.it_disposition, rc);
         RETURN(rc);
 }
-EXPORT_SYMBOL(mdc_enqueue);
 
-/* 
+int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,
+                        struct lu_fid *fid, __u64 *bits)
+{
+        /* We could just return 1 immediately, but since we should only
+         * be called in revalidate_it if we already have a lock, let's
+         * verify that. */
+        struct ldlm_res_id res_id;
+        struct lustre_handle lockh;
+        ldlm_policy_data_t policy;
+        ldlm_mode_t mode;
+        ENTRY;
+
+        if (it->d.lustre.it_lock_handle) {
+                lockh.cookie = it->d.lustre.it_lock_handle;
+                mode = ldlm_revalidate_lock_handle(&lockh, bits);
+        } else {
+                fid_build_reg_res_name(fid, &res_id);
+                switch (it->it_op) {
+                case IT_GETATTR:
+                        policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
+                        break;
+                case IT_LAYOUT:
+                        policy.l_inodebits.bits = MDS_INODELOCK_LAYOUT;
+                        break;
+                default:
+                        policy.l_inodebits.bits = MDS_INODELOCK_LOOKUP;
+                        break;
+                }
+                mode = ldlm_lock_match(exp->exp_obd->obd_namespace,
+                                       LDLM_FL_BLOCK_GRANTED, &res_id,
+                                       LDLM_IBITS, &policy,
+                                       LCK_CR|LCK_CW|LCK_PR|LCK_PW, &lockh, 0);
+        }
+
+        if (mode) {
+                it->d.lustre.it_lock_handle = lockh.cookie;
+                it->d.lustre.it_lock_mode = mode;
+        } else {
+                it->d.lustre.it_lock_handle = 0;
+                it->d.lustre.it_lock_mode = 0;
+        }
+
+        RETURN(!!mode);
+}
+
+/*
  * This long block is all about fixing up the lock and request state
  * so that it is correct as of the moment _before_ the operation was
  * applied; that way, the VFS will think that everything is normal and
@@ -474,94 +1057,45 @@ EXPORT_SYMBOL(mdc_enqueue);
  * ll_create/ll_open gets called.
  *
  * The server will return to us, in it_disposition, an indication of
- * exactly what d.lustre->it_status refers to.
+ * exactly what d.lustre.it_status refers to.
  *
- * If DISP_OPEN_OPEN is set, then d.lustre->it_status refers to the open() call,
+ * If DISP_OPEN_OPEN is set, then d.lustre.it_status refers to the open() call,
  * otherwise if DISP_OPEN_CREATE is set, then it status is the
  * creation failure mode.  In either case, one of DISP_LOOKUP_NEG or
  * DISP_LOOKUP_POS will be set, indicating whether the child lookup
  * was successful.
  *
- * Else, if DISP_LOOKUP_EXECD then d.lustre->it_status is the rc of the
+ * Else, if DISP_LOOKUP_EXECD then d.lustre.it_status is the rc of the
  * child lookup.
  */
-int mdc_intent_lock(struct obd_export *exp, struct lustre_id *pid, 
-                    const char *name, int len, void *lmm, int lmmsize, 
-                    struct lustre_id *cid, struct lookup_intent *it, 
+int mdc_intent_lock(struct obd_export *exp, struct md_op_data *op_data,
+                    void *lmm, int lmmsize, struct lookup_intent *it,
                     int lookup_flags, struct ptlrpc_request **reqp,
-                    ldlm_blocking_callback cb_blocking)
+                    ldlm_blocking_callback cb_blocking,
+                   __u64 extra_lock_flags)
 {
         struct lustre_handle lockh;
-        struct ptlrpc_request *request;
-        struct mds_body *mds_body;
-        struct lustre_handle old_lock;
-        struct ldlm_lock *lock;
         int rc = 0;
         ENTRY;
         LASSERT(it);
 
-        CDEBUG(D_DLMTRACE, "name: %*s in obj "DLID4", intent: %s flags %#o\n",
-               len, name, OLID4(pid), ldlm_it2str(it->it_op), it->it_flags);
+        CDEBUG(D_DLMTRACE, "(name: %.*s,"DFID") in obj "DFID
+               ", intent: %s flags %#o\n", op_data->op_namelen,
+               op_data->op_name, PFID(&op_data->op_fid2),
+               PFID(&op_data->op_fid1), ldlm_it2str(it->it_op),
+               it->it_flags);
 
-        if (cid && (it->it_op == IT_LOOKUP || it->it_op == IT_GETATTR ||
-                    it->it_op == IT_CHDIR)) {
+        lockh.cookie = 0;
+        if (fid_is_sane(&op_data->op_fid2) &&
+            (it->it_op & (IT_LOOKUP | IT_GETATTR))) {
                 /* We could just return 1 immediately, but since we should only
                  * be called in revalidate_it if we already have a lock, let's
                  * verify that. */
-                struct ldlm_res_id res_id = {.name = {id_fid(cid),
-                                                      id_group(cid)}};
-                struct lustre_handle lockh;
-                ldlm_policy_data_t policy;
-                int mode;
-
-                /* For the GETATTR case, ll_revalidate_it issues two separate
-                   queries - for LOOKUP and for UPDATE lock because it cannot
-                   check them together - we might have those two bits to be
-                   present in two separate granted locks */
-                policy.l_inodebits.bits = (it->it_op == IT_GETATTR) ?
-                        MDS_INODELOCK_UPDATE : MDS_INODELOCK_LOOKUP;
-                
-                mode = LCK_PR;
-                rc = ldlm_lock_match(exp->exp_obd->obd_namespace,
-                                     LDLM_FL_BLOCK_GRANTED, &res_id,
-                                     LDLM_IBITS, &policy, mode,
-                                     &lockh);
-
-                if (!rc) {
-                        mode = LCK_CR;
-                        rc = ldlm_lock_match(exp->exp_obd->obd_namespace,
-                                             LDLM_FL_BLOCK_GRANTED, &res_id,
-                                             LDLM_IBITS, &policy, mode,
-                                             &lockh);
-                }
-                if (!rc) {
-                        mode = LCK_PW;
-                        rc = ldlm_lock_match(exp->exp_obd->obd_namespace,
-                                             LDLM_FL_BLOCK_GRANTED, &res_id,
-                                             LDLM_IBITS, &policy, mode,
-                                             &lockh);
-                }
-                if (!rc) {
-                        mode = LCK_CW;
-                        rc = ldlm_lock_match(exp->exp_obd->obd_namespace,
-                                             LDLM_FL_BLOCK_GRANTED, &res_id,
-                                             LDLM_IBITS, &policy, mode,
-                                             &lockh);
-                }
-                if (rc) {
-                        if (ptlrpcs_check_cred(exp->exp_obd->u.cli.cl_import)) {
-                                /* return immediately if no credential held */
-                                ldlm_lock_decref(&lockh, mode);
-                                RETURN(-EACCES);
-                        }
-                        memcpy(&LUSTRE_IT(it)->it_lock_handle, &lockh,
-                               sizeof(lockh));
-                        LUSTRE_IT(it)->it_lock_mode = mode;
-                }
-
-                /* Only return failure if it was not GETATTR by cid (from
-                   inode_revalidate) */
-                if (rc || name)
+                it->d.lustre.it_lock_handle = 0;
+                rc = mdc_revalidate_lock(exp, it, &op_data->op_fid2, NULL);
+                /* Only return failure if it was not GETATTR by cfid
+                   (from inode_revalidate) */
+                if (rc || op_data->op_namelen != 0)
                         RETURN(rc);
         }
 
@@ -574,124 +1108,138 @@ int mdc_intent_lock(struct obd_export *exp, struct lustre_id *pid,
          * this and use the request from revalidate.  In this case, revalidate
          * never dropped its reference, so the refcounts are all OK */
         if (!it_disposition(it, DISP_ENQ_COMPLETE)) {
-                struct mdc_op_data *op_data;
+                struct ldlm_enqueue_info einfo =
+                        { LDLM_IBITS, it_to_lock_mode(it), cb_blocking,
+                          ldlm_completion_ast, NULL, NULL, NULL };
+
+                /* For case if upper layer did not alloc fid, do it now. */
+                if (!fid_is_sane(&op_data->op_fid2) && it->it_op & IT_CREAT) {
+                        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);
+                        }
+                }
+                rc = mdc_enqueue(exp, &einfo, it, op_data, &lockh,
+                                 lmm, lmmsize, NULL, extra_lock_flags);
+                if (rc < 0)
+                        RETURN(rc);
+        } else if (!fid_is_sane(&op_data->op_fid2) ||
+                   !(it->it_create_mode & M_CHECK_STALE)) {
+                /* DISP_ENQ_COMPLETE set means there is extra reference on
+                 * request referenced from this intent, saved for subsequent
+                 * lookup.  This path is executed when we proceed to this
+                 * lookup, so we clear DISP_ENQ_COMPLETE */
+                it_clear_disposition(it, DISP_ENQ_COMPLETE);
+        }
+        *reqp = it->d.lustre.it_data;
+        rc = mdc_finish_intent_lock(exp, *reqp, op_data, it, &lockh);
+        RETURN(rc);
+}
 
-                OBD_ALLOC(op_data, sizeof(*op_data));
-                if (op_data == NULL)
-                        RETURN(-ENOMEM);
+static int mdc_intent_getattr_async_interpret(const struct lu_env *env,
+                                              struct ptlrpc_request *req,
+                                              void *args, int rc)
+{
+        struct mdc_getattr_args  *ga = args;
+        struct obd_export        *exp = ga->ga_exp;
+        struct md_enqueue_info   *minfo = ga->ga_minfo;
+        struct ldlm_enqueue_info *einfo = ga->ga_einfo;
+        struct lookup_intent     *it;
+        struct lustre_handle     *lockh;
+        struct obd_device        *obddev;
+       struct ldlm_reply        *lockrep;
+       __u64                     flags = LDLM_FL_HAS_INTENT;
+        ENTRY;
 
-                mdc_id2mdc_data(op_data, pid, cid, name, len, 0);
+        it    = &minfo->mi_it;
+        lockh = &minfo->mi_lockh;
 
-                if (name != NULL)
-                        op_data->valid |= OBD_MD_FID;
+        obddev = class_exp2obd(exp);
 
-                rc = mdc_enqueue(exp, LDLM_IBITS, it, it_to_lock_mode(it),
-                                 op_data, &lockh, lmm, lmmsize,
-                                 ldlm_completion_ast, cb_blocking, NULL);
-                OBD_FREE(op_data, sizeof(*op_data));
-                if (rc < 0)
-                        RETURN(rc);
-                
-                memcpy(&LUSTRE_IT(it)->it_lock_handle, &lockh, sizeof(lockh));
-        }
-        request = *reqp = LUSTRE_IT(it)->it_data;
-        LASSERT(request != NULL);
-        
-        /* If we're doing an IT_OPEN which did not result in an actual
-         * successful open, then we need to remove the bit which saves this
-         * request for unconditional replay.
-         *
-         * It's important that we do this first!  Otherwise we might exit the
-         * function without doing so, and try to replay a failed create (bug
-         * 3440) */
-        if (it->it_op & IT_OPEN && request->rq_replay &&
-            (!it_disposition(it, DISP_OPEN_OPEN) || LUSTRE_IT(it)->it_status != 0))
-                mdc_clear_replay_flag(request, LUSTRE_IT(it)->it_status);
-        if (!it_disposition(it, DISP_IT_EXECD)) {
-                /* The server failed before it even started executing the
-                 * intent, i.e. because it couldn't unpack the request. */
-                LASSERT(LUSTRE_IT(it)->it_status != 0);
-                RETURN(LUSTRE_IT(it)->it_status);
+        mdc_exit_request(&obddev->u.cli);
+        if (OBD_FAIL_CHECK(OBD_FAIL_MDC_GETATTR_ENQUEUE))
+                rc = -ETIMEDOUT;
+
+        rc = ldlm_cli_enqueue_fini(exp, req, einfo->ei_type, 1, einfo->ei_mode,
+                                   &flags, NULL, 0, lockh, rc);
+        if (rc < 0) {
+                CERROR("ldlm_cli_enqueue_fini: %d\n", rc);
+                mdc_clear_replay_flag(req, rc);
+                GOTO(out, rc);
         }
-        rc = it_open_error(DISP_IT_EXECD, it);
-        if (rc)
-                RETURN(rc);
 
-        mds_body = lustre_msg_buf(request->rq_repmsg, 1, sizeof(*mds_body));
-        LASSERT(mds_body != NULL);      /* mdc_enqueue checked */
-        LASSERT_REPSWABBED(request, 1); /* mdc_enqueue swabbed */
+       lockrep = req_capsule_server_get(&req->rq_pill, &RMF_DLM_REP);
+       LASSERT(lockrep != NULL);
 
-        /* If we were revalidating a fid/name pair, mark the intent in case we
-         * fail and get called again from lookup */
-        if (cid != NULL) {
-                it_set_disposition(it, DISP_ENQ_COMPLETE);
-                /* Also: did we find the same inode? */
-                
-                /* we have to compare all the fields but type, because MDS can
-                 * return fid/mds/ino/gen if inode lives on another MDS -bzzz */
-                if (!(lookup_flags & LOOKUP_COBD) && !id_equal(cid, &mds_body->id1))
-                        RETURN(-ESTALE);
-        }
+       lockrep->lock_policy_res2 =
+               ptlrpc_status_ntoh(lockrep->lock_policy_res2);
 
-        rc = it_open_error(DISP_LOOKUP_EXECD, it);
+        rc = mdc_finish_enqueue(exp, req, einfo, it, lockh, rc);
         if (rc)
-                RETURN(rc);
+                GOTO(out, rc);
 
-        /*
-         * keep requests around for the multiple phases of the call this shows
-         * the DISP_XX must guarantee we make it into the call.
-         */
-        if (it_disposition(it, DISP_OPEN_CREATE) &&
-            !it_open_error(DISP_OPEN_CREATE, it))
-                ptlrpc_request_addref(request); /* balanced in ll_create_node */
-        if (it_disposition(it, DISP_OPEN_OPEN) &&
-            !it_open_error(DISP_OPEN_OPEN, it))
-                ptlrpc_request_addref(request); /* balanced in ll_file_open */
+        rc = mdc_finish_intent_lock(exp, req, &minfo->mi_data, it, lockh);
+        EXIT;
 
-        if (it->it_op & IT_CREAT) {
-                /* XXX this belongs in ll_create_it */
-        } else if (it->it_op == IT_OPEN) {
-                LASSERT(!it_disposition(it, DISP_OPEN_CREATE));
-        } else {
-                LASSERT(it->it_op & (IT_GETATTR | IT_LOOKUP | IT_CHDIR));
+out:
+        OBD_FREE_PTR(einfo);
+        minfo->mi_cb(req, minfo, rc);
+        return 0;
+}
+
+int mdc_intent_getattr_async(struct obd_export *exp,
+                             struct md_enqueue_info *minfo,
+                             struct ldlm_enqueue_info *einfo)
+{
+        struct md_op_data       *op_data = &minfo->mi_data;
+        struct lookup_intent    *it = &minfo->mi_it;
+        struct ptlrpc_request   *req;
+        struct mdc_getattr_args *ga;
+        struct obd_device       *obddev = class_exp2obd(exp);
+        struct ldlm_res_id       res_id;
+        /*XXX: Both MDS_INODELOCK_LOOKUP and MDS_INODELOCK_UPDATE are needed
+         *     for statahead currently. Consider CMD in future, such two bits
+         *     maybe managed by different MDS, should be adjusted then. */
+        ldlm_policy_data_t       policy = {
+                                        .l_inodebits = { MDS_INODELOCK_LOOKUP | 
+                                                         MDS_INODELOCK_UPDATE }
+                                 };
+        int                      rc = 0;
+       __u64                    flags = LDLM_FL_HAS_INTENT;
+        ENTRY;
+
+        CDEBUG(D_DLMTRACE,"name: %.*s in inode "DFID", intent: %s flags %#o\n",
+               op_data->op_namelen, op_data->op_name, PFID(&op_data->op_fid1),
+               ldlm_it2str(it->it_op), it->it_flags);
+
+        fid_build_reg_res_name(&op_data->op_fid1, &res_id);
+        req = mdc_intent_getattr_pack(exp, it, op_data);
+        if (!req)
+                RETURN(-ENOMEM);
+
+        rc = mdc_enter_request(&obddev->u.cli);
+        if (rc != 0) {
+                ptlrpc_req_finished(req);
+                RETURN(rc);
         }
 
-        /*
-         * if we already have a matching lock, then cancel the new one. We have
-         * to set the data here instead of in mdc_enqueue, because we need to
-         * use the child's inode as the l_ast_data to match, and that's not
-         * available until intent_finish has performed the iget().)
-         */
-        lock = ldlm_handle2lock(&lockh);
-        if (lock) {
-                ldlm_policy_data_t policy = lock->l_policy_data;
-                LDLM_DEBUG(lock, "matching against this");
-                LDLM_LOCK_PUT(lock);
-                
-                LASSERTF(id_fid(&mds_body->id1) == lock->l_resource->lr_name.name[0] &&
-                         id_group(&mds_body->id1) == lock->l_resource->lr_name.name[1],
-                         "Invalid lock is returned to client. Lock res_is: %lu/%lu, "
-                         "response res_id: %lu/%lu.\n",
-                         (unsigned long)lock->l_resource->lr_name.name[0],
-                         (unsigned long)lock->l_resource->lr_name.name[1],
-                         (unsigned long)id_fid(&mds_body->id1),
-                         (unsigned long)id_group(&mds_body->id1));
-                
-                memcpy(&old_lock, &lockh, sizeof(lockh));
-                if (ldlm_lock_match(NULL, LDLM_FL_BLOCK_GRANTED, NULL,
-                                    LDLM_IBITS, &policy, LCK_NL, &old_lock)) {
-                        ldlm_lock_decref_and_cancel(&lockh,
-                                                    LUSTRE_IT(it)->it_lock_mode);
-                        memcpy(&lockh, &old_lock, sizeof(old_lock));
-                        memcpy(&LUSTRE_IT(it)->it_lock_handle, &lockh,
-                               sizeof(lockh));
-                }
+        rc = ldlm_cli_enqueue(exp, &req, einfo, &res_id, &policy, &flags, NULL,
+                             0, LVB_T_NONE, &minfo->mi_lockh, 1);
+        if (rc < 0) {
+                mdc_exit_request(&obddev->u.cli);
+                ptlrpc_req_finished(req);
+                RETURN(rc);
         }
-        CDEBUG(D_DENTRY, "D_IT dentry %*s intent: %s status %d disp %x rc %d\n",
-               len, name, ldlm_it2str(it->it_op), LUSTRE_IT(it)->it_status,
-               LUSTRE_IT(it)->it_disposition, rc);
 
-        RETURN(rc);
+        CLASSERT(sizeof(*ga) <= sizeof(req->rq_async_args));
+        ga = ptlrpc_req_async_args(req);
+        ga->ga_exp = exp;
+        ga->ga_minfo = minfo;
+        ga->ga_einfo = einfo;
+
+        req->rq_interpret_reply = mdc_intent_getattr_async_interpret;
+        ptlrpcd_add_req(req, PDL_POLICY_LOCAL, -1);
+
+        RETURN(0);
 }
-EXPORT_SYMBOL(mdc_intent_lock);