Whamcloud - gitweb
* cleanup after removing lnet/tests
[fs/lustre-release.git] / lustre / mdc / mdc_locks.c
index ae07c91..618f430 100644 (file)
@@ -3,20 +3,23 @@
  *
  * Copyright (C) 2001-2003 Cluster File Systems, Inc.
  *
- *   This file is part of Lustre, http://www.sf.net/projects/lustre/
+ *   This file is part of the Lustre file system, http://www.lustre.org
+ *   Lustre is a trademark of Cluster File Systems, Inc.
  *
- *   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.
+ *   You may have signed or agreed to another license before downloading
+ *   this software.  If so, you are bound by the terms and conditions
+ *   of that agreement, and the following does not apply to you.  See the
+ *   LICENSE file included with this distribution for more information.
  *
- *   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.
+ *   If you did not agree to a different license, then this copy of Lustre
+ *   is open source 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.
  *
- *   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.
+ *   In either case, 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
+ *   license text for more details.
  */
 
 #ifndef EXPORT_SYMTAB
 # include <liblustre.h>
 #endif
 
-#include <linux/obd_class.h>
-#include <linux/lustre_mds.h>
-#include <linux/lustre_dlm.h>
-#include <linux/lustre_snap.h>
-#include <linux/lprocfs_status.h>
+#include <obd_class.h>
+#include <lustre_dlm.h>
+#include <lprocfs_status.h>
 #include "mdc_internal.h"
 
 int it_disposition(struct lookup_intent *it, int flag)
@@ -52,34 +53,19 @@ void it_set_disposition(struct lookup_intent *it, int flag)
 }
 EXPORT_SYMBOL(it_set_disposition);
 
-static void mdc_fid2mdc_op_data(struct mdc_op_data *data, struct ll_uctxt *ctxt,
-                                struct ll_fid *f1, struct ll_fid *f2,
-                                const char *name, int namelen, int mode)
+void it_clear_disposition(struct lookup_intent *it, int flag)
 {
-        LASSERT(data);
-        LASSERT(ctxt);
-        LASSERT(f1);
-
-        data->ctxt = *ctxt;
-        data->fid1 = *f1;
-        if (f2)
-                data->fid2 = *f2;
-        else
-                memset(&data->fid2, 0, sizeof(data->fid2));
-        data->name = name;
-        data->namelen = namelen;
-        data->create_mode = mode;
-        data->mod_time = LTIME_S(CURRENT_TIME);
+        it->d.lustre.it_disposition &= ~flag;
 }
+EXPORT_SYMBOL(it_clear_disposition);
 
 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;
+                return LCK_CW;
+        else if (it->it_op & (IT_READDIR | IT_GETATTR | IT_OPEN | IT_LOOKUP))
+                return LCK_CR;
 
         LBUG();
         RETURN(-EINVAL);
@@ -88,28 +74,28 @@ static int it_to_lock_mode(struct lookup_intent *it)
 int it_open_error(int phase, struct lookup_intent *it)
 {
         if (it_disposition(it, DISP_OPEN_OPEN)) {
-                if (phase == DISP_OPEN_OPEN)
+                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)
+                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)
+                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)
+                if (phase >= DISP_IT_EXECD)
                         return it->d.lustre.it_status;
                 else
                         return 0;
@@ -122,7 +108,7 @@ int it_open_error(int phase, struct lookup_intent *it)
 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)
+void mdc_set_lock_data(__u64 *l, void *data)
 {
         struct ldlm_lock *lock;
         struct lustre_handle *lockh = (struct lustre_handle *)l;
@@ -130,13 +116,13 @@ int mdc_set_lock_data(struct obd_export *exp, __u64 *l, void *data)
 
         if (!*l) {
                 EXIT;
-                return 0;
+                return;
         }
 
         lock = ldlm_handle2lock(lockh);
 
         LASSERT(lock != NULL);
-        l_lock(&lock->l_resource->lr_namespace->ns_lock);
+        lock_res_and_lock(lock);
 #ifdef __KERNEL__
         if (lock->l_ast_data && lock->l_ast_data != data) {
                 struct inode *new_inode = data;
@@ -150,11 +136,10 @@ int mdc_set_lock_data(struct obd_export *exp, __u64 *l, void *data)
         }
 #endif
         lock->l_ast_data = data;
-        l_unlock(&lock->l_resource->lr_namespace->ns_lock);
+        unlock_res_and_lock(lock);
         LDLM_LOCK_PUT(lock);
 
         EXIT;
-        return 0;
 }
 EXPORT_SYMBOL(mdc_set_lock_data);
 
@@ -167,29 +152,80 @@ int mdc_change_cbdata(struct obd_export *exp, struct ll_fid *fid,
         res_id.name[0] = fid->id;
         res_id.name[1] = fid->generation;
 
-        ldlm_change_cbdata(class_exp2obd(exp)->obd_namespace, &res_id, it, 
-                           data);
+        ldlm_resource_iterate(class_exp2obd(exp)->obd_namespace, &res_id,
+                              it, data);
 
         EXIT;
         return 0;
 }
 
-#if CONFIG_SNAPFS
-int mdc_set_clone_info(struct obd_export *exp, struct lustre_msg *msg, 
-                       int offset)
+static inline void mdc_clear_replay_flag(struct ptlrpc_request *req, int rc)
 {
-        struct client_obd *cli_obd = &exp->exp_obd->u.cli;
-        struct clonefs_info *cl_info;
-        ENTRY;
-        
-        if (cli_obd->cl_clone_info) { 
-                cl_info = (struct clonefs_info *)lustre_msg_buf(msg, offset, 
-                                                                 sizeof (*cl_info));
-                memcpy(cl_info, cli_obd->cl_clone_info, sizeof(*cl_info));
+        /* 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);
         }
-        RETURN(0);        
-} 
-#endif
+        if (rc && req->rq_transno != 0) {
+                DEBUG_REQ(D_ERROR, req, "transno returned on error rc %d", rc);
+                LBUG();
+        }
+}
+
+static int round_up(int val)
+{
+        int ret = 1;
+        while (val) {
+                val >>= 1;
+                ret <<= 1;
+        }
+        return ret;
+}
+
+/* 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 mds_body *body, int size[6])
+{
+        int new_size, old_size;
+        struct lustre_msg *new_msg;
+
+        /* save old size */
+        old_size = lustre_msg_size(lustre_request_magic(req), 6, size);
+
+        size[DLM_INTENT_REC_OFF + 2] = body->eadatasize;
+        new_size = lustre_msg_size(lustre_request_magic(req), 6, size);
+        OBD_ALLOC(new_msg, new_size);
+        if (new_msg != NULL) {
+                struct lustre_msg *old_msg = req->rq_reqmsg;
+
+                DEBUG_REQ(D_INFO, req, "replace reqmsg for larger EA %u\n",
+                          body->eadatasize);
+                memcpy(new_msg, old_msg, old_size);
+                lustre_msg_set_buflen(new_msg, DLM_INTENT_REC_OFF + 2,
+                                      body->eadatasize);
+
+                spin_lock(&req->rq_lock);
+                req->rq_reqmsg = new_msg;
+                req->rq_reqlen = new_size;
+                spin_unlock(&req->rq_lock);
+
+                OBD_FREE(old_msg, old_size);
+        } else {
+                body->valid &= ~OBD_MD_FLEASIZE;
+                body->eadatasize = 0;
+        }
+}
 
 /* We always reserve enough space in the reply packet for a stripe MD, because
  * we don't know in advance the file type. */
@@ -203,130 +239,168 @@ int mdc_enqueue(struct obd_export *exp,
                 int lmmsize,
                 ldlm_completion_callback cb_completion,
                 ldlm_blocking_callback cb_blocking,
-                void *cb_data)
+                void *cb_data, int extra_lock_flags)
 {
         struct ptlrpc_request *req;
         struct obd_device *obddev = class_exp2obd(exp);
         struct ldlm_res_id res_id =
                 { .name = {data->fid1.id, data->fid1.generation} };
         ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_LOOKUP } };
-        int size[6] = {sizeof(struct ldlm_request), sizeof(struct ldlm_intent)};
-        int rc, flags = LDLM_FL_HAS_INTENT;
-        int repsize[4] = {sizeof(struct ldlm_reply),
-                          sizeof(struct mds_body),
-                          obddev->u.cli.cl_max_mds_easize,
-                          obddev->u.cli.cl_max_mds_cookiesize};
-        struct ldlm_reply *dlm_rep;
-        struct ldlm_intent *lit;
         struct ldlm_request *lockreq;
+        struct ldlm_intent *lit;
+        struct ldlm_reply *lockrep;
+        int size[7] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
+                        [DLM_LOCKREQ_OFF]     = sizeof(*lockreq),
+                        [DLM_INTENT_IT_OFF]   = sizeof(*lit) };
+        int repsize[5] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
+                           [DLM_LOCKREPLY_OFF]   = sizeof(*lockrep),
+                           [DLM_REPLY_REC_OFF]   = sizeof(struct mds_body),
+                           [DLM_REPLY_REC_OFF+1] = obddev->u.cli.
+                                                   cl_max_mds_easize };
+        int flags = extra_lock_flags | LDLM_FL_HAS_INTENT;
+        int repbufcnt = 4, rc;
         void *eadata;
-        unsigned long irqflags;
-        int   reply_buffers = 0;
         ENTRY;
 
+        LASSERTF(lock_type == LDLM_IBITS, "lock type %d\n", lock_type);
 //        LDLM_DEBUG_NOLOCK("mdsintent=%s,name=%s,dir=%lu",
 //                          ldlm_it2str(it->it_op), it_name, it_inode->i_ino);
 
         if (it->it_op & IT_OPEN) {
                 it->it_create_mode |= S_IFREG;
-                it->it_create_mode &= ~current->fs->umask;
 
-                size[2] = sizeof(struct mds_rec_create);
-                size[3] = data->namelen + 1;
-                size[4] = obddev->u.cli.cl_max_mds_easize;
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LDLM_ENQUEUE, 
-                                      5, size, NULL);
+                size[DLM_INTENT_REC_OFF] = sizeof(struct mds_rec_create);
+                size[DLM_INTENT_REC_OFF + 1] = data->namelen + 1;
+                /* As an optimization, we allocate an RPC request buffer for
+                 * at least a default-sized LOV EA even if we aren't sending
+                 * one.  We grow the whole request to the next power-of-two
+                 * size since we get that much from a slab allocation anyways.
+                 * This avoids an allocation below in the common case where
+                 * we need to save a default-sized LOV EA for open replay. */
+                size[DLM_INTENT_REC_OFF + 2] = max(lmmsize,
+                                          obddev->u.cli.cl_default_mds_easize);
+                rc = lustre_msg_size(class_exp2cliimp(exp)->imp_msg_magic, 6,
+                                     size);
+                if (rc & (rc - 1))
+                        size[DLM_INTENT_REC_OFF + 2] =
+                                 min(size[DLM_INTENT_REC_OFF+2]+round_up(rc)-rc,
+                                     obddev->u.cli.cl_max_mds_easize);
+
+                if (it->it_flags & O_JOIN_FILE) {
+                        __u64 head_size = *(__u32*)cb_data;
+                        __u32 tsize = *(__u32*)lmm;
+
+                        /* join is like an unlink of the tail */
+                        policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
+                        size[DLM_INTENT_REC_OFF + 3] =
+                                                 sizeof(struct mds_rec_join);
+                        req = ptlrpc_prep_req(class_exp2cliimp(exp),
+                                              LUSTRE_DLM_VERSION, LDLM_ENQUEUE,
+                                              7, size, NULL);
+                        /* when joining file, cb_data and lmm args together
+                         * indicate the head file size*/
+                        mdc_join_pack(req, DLM_INTENT_REC_OFF + 3, data,
+                                      (head_size << 32) | tsize);
+                        cb_data = NULL;
+                        lmm = NULL;
+                } else {
+                        req = ptlrpc_prep_req(class_exp2cliimp(exp),
+                                              LUSTRE_DLM_VERSION, LDLM_ENQUEUE,
+                                              6, size, NULL);
+                }
+
                 if (!req)
                         RETURN(-ENOMEM);
 
-                spin_lock_irqsave (&req->rq_lock, irqflags);
+                spin_lock(&req->rq_lock);
                 req->rq_replay = 1;
-                spin_unlock_irqrestore (&req->rq_lock, irqflags);
+                spin_unlock(&req->rq_lock);
 
                 /* pack the intent */
-                lit = lustre_msg_buf(req->rq_reqmsg, 1, sizeof (*lit));
+                lit = lustre_msg_buf(req->rq_reqmsg, DLM_INTENT_IT_OFF,
+                                     sizeof(*lit));
                 lit->opc = (__u64)it->it_op;
 
                 /* pack the intended request */
-                mdc_open_pack(req->rq_reqmsg, 2, data, it->it_create_mode, 0,
-                              it->it_flags, lmm, lmmsize);
-                /* get ready for the reply */
-                reply_buffers = 3;
-                req->rq_replen = lustre_msg_size(3, repsize);
-        } else if (it->it_op & (IT_GETATTR | IT_LOOKUP | IT_CHDIR)) {
-                int valid = OBD_MD_FLNOTOBD | OBD_MD_FLEASIZE;
-                size[2] = sizeof(struct mds_body);
-                size[3] = data->namelen + 1;
+                mdc_open_pack(req, DLM_INTENT_REC_OFF, data, it->it_create_mode,
+                              0, it->it_flags, lmm, lmmsize);
+
+                repsize[repbufcnt++] = LUSTRE_POSIX_ACL_MAX_SIZE;
+        } else if (it->it_op & IT_UNLINK) {
+                size[DLM_INTENT_REC_OFF] = sizeof(struct mds_rec_unlink);
+                size[DLM_INTENT_REC_OFF + 1] = data->namelen + 1;
+                policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
+                req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION,
+                                      LDLM_ENQUEUE, 5, size, NULL);
+                if (!req)
+                        RETURN(-ENOMEM);
+
+                /* pack the intent */
+                lit = lustre_msg_buf(req->rq_reqmsg, DLM_INTENT_IT_OFF,
+                                     sizeof(*lit));
+                lit->opc = (__u64)it->it_op;
+
+                /* pack the intended request */
+                mdc_unlink_pack(req, DLM_INTENT_REC_OFF, data);
+
+                repsize[repbufcnt++] = obddev->u.cli.cl_max_mds_cookiesize;
+        } else if (it->it_op & (IT_GETATTR | IT_LOOKUP)) {
+                obd_valid valid = OBD_MD_FLGETATTR | OBD_MD_FLEASIZE |
+                                  OBD_MD_FLACL | OBD_MD_FLMODEASIZE |
+                                  OBD_MD_FLDIREA;
+                size[DLM_INTENT_REC_OFF] = sizeof(struct mds_body);
+                size[DLM_INTENT_REC_OFF + 1] = data->namelen + 1;
 
                 if (it->it_op & IT_GETATTR)
                         policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
-#if CONFIG_SNAPFS                
-                size[4] = sizeof(struct clonefs_info); 
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LDLM_ENQUEUE, 5,
-                                      size, NULL);
-#else
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LDLM_ENQUEUE, 4,
-                                      size, NULL);
 
-#endif
+                req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION,
+                                      LDLM_ENQUEUE, 5, size, NULL);
                 if (!req)
                         RETURN(-ENOMEM);
 
                 /* pack the intent */
-                lit = lustre_msg_buf(req->rq_reqmsg, 1, sizeof (*lit));
+                lit = lustre_msg_buf(req->rq_reqmsg, DLM_INTENT_IT_OFF,
+                                     sizeof(*lit));
                 lit->opc = (__u64)it->it_op;
 
                 /* pack the intended request */
-                mdc_getattr_pack(req->rq_reqmsg, valid, 2, it->it_flags, data);
-#if CONFIG_SNAPFS               
-                mdc_set_clone_info(exp, req->rq_reqmsg, 4); 
-#endif                 
-                /* get ready for the reply */
-                reply_buffers = 3;
-                req->rq_replen = lustre_msg_size(3, repsize);
+                mdc_getattr_pack(req, DLM_INTENT_REC_OFF, valid,
+                                 it->it_flags, data);
+
+                repsize[repbufcnt++] = LUSTRE_POSIX_ACL_MAX_SIZE;
         } else if (it->it_op == IT_READDIR) {
                 policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LDLM_ENQUEUE, 1,
-                                      size, 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) {
-                size[2] = sizeof(struct mds_body);
-                policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
-                req = ptlrpc_prep_req(class_exp2cliimp(exp), LDLM_ENQUEUE, 3,
-                                      size, NULL);
+                req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION,
+                                      LDLM_ENQUEUE, 2, size, NULL);
                 if (!req)
                         RETURN(-ENOMEM);
 
-                /* pack the intended request */
-                mdc_getattr_pack(req->rq_reqmsg, 0,  2, 0, data);
-
-                /* pack the intent */
-                lit = lustre_msg_buf(req->rq_reqmsg, 1, sizeof (*lit));
-                lit->opc = (__u64)it->it_op;
-
-                /* get ready for the reply */
-                reply_buffers = 3;
-                req->rq_replen = lustre_msg_size(3, repsize);
+                repbufcnt = 2;
         } else {
                 LBUG();
                 RETURN(-EINVAL);
         }
+
+        /* get ready for the reply */
+        ptlrpc_req_set_repsize(req, repbufcnt, repsize);
+
+         /* 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 */
         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_enter_request(&obddev->u.cli);
+        rc = ldlm_cli_enqueue(exp, &req, res_id, lock_type, &policy,
+                              lock_mode, &flags, cb_blocking, cb_completion,
+                              NULL, cb_data, NULL, 0, NULL, lockh, 0);
+        mdc_exit_request(&obddev->u.cli);
         mdc_put_rpc_lock(obddev->u.cli.cl_rpc_lock, it);
 
         /* 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, 0, sizeof (*lockreq));
+                lockreq = lustre_msg_buf(req->rq_reqmsg, DLM_LOCKREQ_OFF,
+                                         sizeof(*lockreq));
                 lockreq->lock_flags |= LDLM_FL_INTENT_ONLY;
         }
 
@@ -338,7 +412,8 @@ int mdc_enqueue(struct obd_export *exp,
                 rc = 0;
         } else if (rc != 0) {
                 CERROR("ldlm_cli_enqueue: %d\n", rc);
-                LASSERT (rc < 0);
+                LASSERTF(rc < 0, "rc %d\n", rc);
+                mdc_clear_replay_flag(req, rc);
                 ptlrpc_req_finished(req);
                 RETURN(rc);
         } else { /* rc = 0 */
@@ -352,64 +427,96 @@ int mdc_enqueue(struct obd_export *exp,
                         ldlm_lock_decref(lockh, lock_mode);
                         lock_mode = lock->l_req_mode;
                 }
-
-                ldlm_lock_allow_match(lock);
                 LDLM_LOCK_PUT(lock);
         }
 
-        dlm_rep = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*dlm_rep));
-        LASSERT(dlm_rep != NULL);           /* checked by ldlm_cli_enqueue() */
-        LASSERT_REPSWABBED(req, 0);         /* swabbed by ldlm_cli_enqueue() */
+        lockrep = lustre_msg_buf(req->rq_repmsg, DLM_LOCKREPLY_OFF,
+                                 sizeof(*lockrep));
+        LASSERT(lockrep != NULL);                 /* checked by ldlm_cli_enqueue() */
+        LASSERT_REPSWABBED(req, DLM_LOCKREPLY_OFF); /* swabbed by ldlm_cli_enqueue() */
 
-        it->d.lustre.it_disposition = (int) dlm_rep->lock_policy_res1;
-        it->d.lustre.it_status = (int) dlm_rep->lock_policy_res2;
+        it->d.lustre.it_disposition = (int)lockrep->lock_policy_res1;
+        it->d.lustre.it_status = (int)lockrep->lock_policy_res2;
         it->d.lustre.it_lock_mode = lock_mode;
         it->d.lustre.it_data = req;
 
-        if (it->d.lustre.it_status < 0 && req->rq_replay) {
-                LASSERT(req->rq_transno == 0);
-                /* Don't hold error requests for replay. */
-                spin_lock(&req->rq_lock);
-                req->rq_replay = 0;
-                spin_unlock(&req->rq_lock);
-        }
+        if (it->d.lustre.it_status < 0 && req->rq_replay)
+                mdc_clear_replay_flag(req, it->d.lustre.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) ||it->d.lustre.it_status != 0))
+                mdc_clear_replay_flag(req, it->d.lustre.it_status);
 
-        DEBUG_REQ(D_RPCTRACE, req, "disposition: %x, status: %d",
-                  it->d.lustre.it_disposition, it->d.lustre.it_status);
+        DEBUG_REQ(D_RPCTRACE, req, "op: %d disposition: %x, status: %d",
+                  it->it_op,it->d.lustre.it_disposition,it->d.lustre.it_status);
 
         /* We know what to expect, so we do any byte flipping required here */
-        LASSERT(reply_buffers == 4 || reply_buffers == 3 || reply_buffers == 1);
-        if (reply_buffers >= 3) {
+        LASSERT(repbufcnt == 5 || repbufcnt == 2);
+        if (repbufcnt == 5) {
                 struct mds_body *body;
 
-                body = lustre_swab_repbuf(req, 1, sizeof (*body),
-                                           lustre_swab_mds_body);
+                body = lustre_swab_repbuf(req, DLM_REPLY_REC_OFF, sizeof(*body),
+                                         lustre_swab_mds_body);
                 if (body == NULL) {
                         CERROR ("Can't swab mds_body\n");
                         RETURN (-EPROTO);
                 }
 
+                /* 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 */
+                if (it_disposition(it, DISP_OPEN_OPEN) &&
+                    !it_open_error(DISP_OPEN_OPEN, it))
+                        mdc_set_open_replay_data(NULL, req);
+
                 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);
+                        eadata = lustre_swab_repbuf(req, DLM_REPLY_REC_OFF + 1,
+                                                    body->eadatasize, NULL);
                         if (eadata == NULL) {
                                 CERROR ("Missing/short eadata\n");
                                 RETURN (-EPROTO);
                         }
+                        if (body->valid & OBD_MD_FLMODEASIZE) {
+                                if (obddev->u.cli.cl_max_mds_easize < 
+                                                        body->max_mdsize) {
+                                        obddev->u.cli.cl_max_mds_easize = 
+                                                body->max_mdsize;
+                                        CDEBUG(D_INFO, "maxeasize become %d\n",
+                                               body->max_mdsize);
+                                }
+                                if (obddev->u.cli.cl_max_mds_cookiesize <
+                                                        body->max_cookiesize) {
+                                        obddev->u.cli.cl_max_mds_cookiesize =
+                                                body->max_cookiesize;
+                                        CDEBUG(D_INFO, "cookiesize become %d\n",
+                                               body->max_cookiesize);
+                                }
+                        }
+                        /* 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. */
                         if (it->it_op & IT_OPEN) {
-                                void *replayea;
+                                int offset = DLM_INTENT_REC_OFF + 2;
 
-                                replayea = lustre_msg_buf(req->rq_reqmsg, 4,
-                                                          body->eadatasize);
-                                LASSERT(replayea);
-                                memcpy(replayea, eadata, body->eadatasize);
+                                if (lustre_msg_buflen(req->rq_reqmsg, offset) <
+                                    body->eadatasize)
+                                        mdc_realloc_openmsg(req, body, size);
 
-                                LASSERT(req->rq_reqmsg->bufcount == 5);
-                                req->rq_reqmsg->buflens[4] = body->eadatasize;
-                                /* If this isn't the last buffer, we might
-                                 * have to shift other data around. */
+                                lmm = lustre_msg_buf(req->rq_reqmsg, offset,
+                                                     body->eadatasize);
+                                if (lmm)
+                                        memcpy(lmm, eadata, body->eadatasize);
                         }
                 }
         }
@@ -445,12 +552,10 @@ EXPORT_SYMBOL(mdc_enqueue);
  * 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 ll_uctxt *uctxt,
-                    struct ll_fid *pfid, const char *name, int len,
-                    void *lmm, int lmmsize, struct ll_fid *cfid,
-                    struct lookup_intent *it, int lookup_flags,
-                    struct ptlrpc_request **reqp,
-                    ldlm_blocking_callback cb_blocking)
+int mdc_intent_lock(struct obd_export *exp, struct mdc_op_data *op_data,
+                    void *lmm, int lmmsize, struct lookup_intent *it,
+                    int lookup_flags, struct ptlrpc_request **reqp,
+                    ldlm_blocking_callback cb_blocking, int extra_lock_flags)
 {
         struct lustre_handle lockh;
         struct ptlrpc_request *request;
@@ -461,44 +566,53 @@ int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt,
         ENTRY;
         LASSERT(it);
 
-        CDEBUG(D_DLMTRACE, "name: %*s in %ld, intent: %s\n", len, name,
-               pfid ? (unsigned long) pfid->id : 0 , ldlm_it2str(it->it_op));
+        CDEBUG(D_DLMTRACE,"name: %.*s in inode "LPU64", intent: %s flags %#o\n",
+               op_data->namelen, op_data->name, op_data->fid1.id,
+               ldlm_it2str(it->it_op), it->it_flags);
 
-        if (cfid && (it->it_op == IT_LOOKUP || it->it_op == IT_GETATTR ||
-                     it->it_op == IT_CHDIR)) {
+        if (op_data->fid2.id &&
+            (it->it_op == IT_LOOKUP || it->it_op == 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 = {cfid->id,
-                                                     cfid->generation}};
+                struct ldlm_res_id res_id = {.name ={op_data->fid2.id,
+                                                     op_data->fid2.generation}};
                 struct lustre_handle lockh;
                 ldlm_policy_data_t policy;
-                int mode = LCK_PR;
-
-                /* For the GETATTR case, ll_revalidate_it issues two separate
-                   queries - for LOOKUP and for UPDATE lock because if 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;
+                int mode = LCK_CR;
+
+                /* As not all attributes are kept under update lock, e.g. 
+                   owner/group/acls are under lookup lock, we need both 
+                   ibits for GETATTR. */
+                policy.l_inodebits.bits = (it->it_op == IT_GETATTR) ?
+                        MDS_INODELOCK_UPDATE | MDS_INODELOCK_LOOKUP :
+                        MDS_INODELOCK_LOOKUP;
+
                 rc = ldlm_lock_match(exp->exp_obd->obd_namespace,
                                      LDLM_FL_BLOCK_GRANTED, &res_id,
-                                     LDLM_IBITS, &policy, LCK_PR, &lockh);
+                                     LDLM_IBITS, &policy, LCK_CR, &lockh);
                 if (!rc) {
-                        mode = LCK_PW;
+                        mode = LCK_CW;
                         rc = ldlm_lock_match(exp->exp_obd->obd_namespace,
                                              LDLM_FL_BLOCK_GRANTED, &res_id,
-                                             LDLM_IBITS, &policy, LCK_PW,
-                                             &lockh);
+                                             LDLM_IBITS, &policy,LCK_CW,&lockh);
+                }
+                if (!rc) {
+                        mode = LCK_PR;
+                        rc = ldlm_lock_match(exp->exp_obd->obd_namespace,
+                                             LDLM_FL_BLOCK_GRANTED, &res_id,
+                                             LDLM_IBITS, &policy,LCK_PR,&lockh);
                 }
                 if (rc) {
                         memcpy(&it->d.lustre.it_lock_handle, &lockh,
                                sizeof(lockh));
                         it->d.lustre.it_lock_mode = mode;
                 }
-                RETURN(rc);
+
+                /* Only return failure if it was not GETATTR by cfid
+                   (from inode_revalidate) */
+                if (rc || op_data->namelen != 0)
+                        RETURN(rc);
         }
 
         /* lookup_it may be called only after revalidate_it has run, because
@@ -510,18 +624,25 @@ int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt,
          * 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;
-                mdc_fid2mdc_op_data(&op_data, uctxt, pfid, cfid, name, len, 0);
 
                 rc = mdc_enqueue(exp, LDLM_IBITS, it, it_to_lock_mode(it),
-                                 &op_data, &lockh, lmm, lmmsize,
-                                 ldlm_completion_ast, cb_blocking, NULL);
+                                 op_data, &lockh, lmm, lmmsize,
+                                 ldlm_completion_ast, cb_blocking, NULL,
+                                 extra_lock_flags);
                 if (rc < 0)
                         RETURN(rc);
                 memcpy(&it->d.lustre.it_lock_handle, &lockh, sizeof(lockh));
+        } else if (!op_data->fid2.id) {
+                /* 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);
         }
         request = *reqp = it->d.lustre.it_data;
         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
@@ -533,36 +654,19 @@ int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt,
         if (rc)
                 RETURN(rc);
 
-        mds_body = lustre_msg_buf(request->rq_repmsg, 1, sizeof(*mds_body));
+        mds_body = lustre_msg_buf(request->rq_repmsg, DLM_REPLY_REC_OFF,
+                                  sizeof(*mds_body));
         LASSERT(mds_body != NULL);           /* mdc_enqueue checked */
         LASSERT_REPSWABBED(request, 1); /* mdc_enqueue swabbed */
 
         /* If we were revalidating a fid/name pair, mark the intent in
          * case we fail and get called again from lookup */
-        if (cfid != NULL) {
+        if (op_data->fid2.id && (it->it_op != IT_GETATTR)) {
                 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 mds/ino/generation triple if inode
-                 * lives on another MDS -bzzz */
-                if (cfid->generation != mds_body->fid1.generation ||
-                                cfid->id != mds_body->fid1.id ||
-                                cfid->mds != mds_body->fid1.mds)
-                        RETURN(-ESTALE);
-        }
-
-        /* 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. */
-        if (it->it_op & IT_OPEN) {
-                if (!it_disposition(it, DISP_OPEN_OPEN) ||
-                    it->d.lustre.it_status != 0) {
-                        unsigned long irqflags;
-
-                        spin_lock_irqsave(&request->rq_lock, irqflags);
-                        request->rq_replay = 0;
-                        spin_unlock_irqrestore(&request->rq_lock, irqflags);
-                }
+                if (memcmp(&op_data->fid2, &mds_body->fid1,
+                           sizeof(op_data->fid2)))
+                        RETURN (-ESTALE);
         }
 
         rc = it_open_error(DISP_LOOKUP_EXECD, it);
@@ -572,19 +676,27 @@ int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt,
         /* 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);
-        if (it_disposition(it, DISP_OPEN_OPEN) &&
-            !it_open_error(DISP_OPEN_OPEN, it))
-                ptlrpc_request_addref(request);
+        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_iit */
+                /* 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));
+                LASSERT(it->it_op & (IT_GETATTR | IT_LOOKUP));
         }
 
         /* If we already have a matching lock, then cancel the new
@@ -607,9 +719,9 @@ int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt,
                                sizeof(lockh));
                 }
         }
-        CDEBUG(D_DENTRY, "D_IT dentry %*s intent: %s status %d disp %x rc %d\n",
-               len, name, ldlm_it2str(it->it_op), it->d.lustre.it_status,
-               it->d.lustre.it_disposition, rc);
+        CDEBUG(D_DENTRY,"D_IT dentry %.*s intent: %s status %d disp %x rc %d\n",
+               op_data->namelen, op_data->name, ldlm_it2str(it->it_op),
+               it->d.lustre.it_status, it->d.lustre.it_disposition, rc);
 
         RETURN(rc);
 }