Whamcloud - gitweb
LU-2675 obd: decruft md_enqueue() and md_intent_lock()
[fs/lustre-release.git] / lustre / lmv / lmv_intent.c
index 3ff3fbb..da76f8f 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) 2002, 2003 Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * 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) 2004, 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_LMV
 #ifdef __KERNEL__
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/pagemap.h>
-#include <asm/div64.h>
+#include <linux/math64.h>
 #include <linux/seq_file.h>
 #include <linux/namei.h>
+#include <linux/lustre_intent.h>
 #else
 #include <liblustre.h>
 #endif
 
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_net.h>
-#include <linux/lustre_idl.h>
-#include <linux/lustre_dlm.h>
-#include <linux/lustre_mds.h>
-#include <linux/obd_class.h>
-#include <linux/obd_ost.h>
-#include <linux/lprocfs_status.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/obd_lmv.h>
-#include <linux/lustre_lite.h>
+#include <obd_support.h>
+#include <lustre/lustre_idl.h>
+#include <lustre_lib.h>
+#include <lustre_net.h>
+#include <lustre_dlm.h>
+#include <lustre_mdc.h>
+#include <obd_class.h>
+#include <lprocfs_status.h>
 #include "lmv_internal.h"
 
-static inline void lmv_drop_intent_lock(struct lookup_intent *it)
+static int lmv_intent_remote(struct obd_export *exp, struct lookup_intent *it,
+                            const struct lu_fid *parent_fid,
+                            struct ptlrpc_request **reqp,
+                            ldlm_blocking_callback cb_blocking,
+                            __u64 extra_lock_flags)
 {
-        if (LUSTRE_IT(it)->it_lock_mode != 0)
-                ldlm_lock_decref((void *)&LUSTRE_IT(it)->it_lock_handle,
-                                 LUSTRE_IT(it)->it_lock_mode);
+       struct obd_device       *obd = exp->exp_obd;
+       struct lmv_obd          *lmv = &obd->u.lmv;
+       struct ptlrpc_request   *req = NULL;
+       struct lustre_handle    plock;
+       struct md_op_data       *op_data;
+       struct lmv_tgt_desc     *tgt;
+       struct mdt_body         *body;
+       int                     pmode;
+       int                     rc = 0;
+       ENTRY;
+
+       body = req_capsule_server_get(&(*reqp)->rq_pill, &RMF_MDT_BODY);
+       if (body == NULL)
+               RETURN(-EPROTO);
+
+       LASSERT((body->valid & OBD_MD_MDS));
+
+       /*
+        * Unfortunately, we have to lie to MDC/MDS to retrieve
+        * attributes llite needs and provideproper locking.
+        */
+       if (it->it_op & IT_LOOKUP)
+               it->it_op = IT_GETATTR;
+
+       /*
+        * We got LOOKUP lock, but we really need attrs.
+        */
+       pmode = it->d.lustre.it_lock_mode;
+       if (pmode) {
+               plock.cookie = it->d.lustre.it_lock_handle;
+               it->d.lustre.it_lock_mode = 0;
+               it->d.lustre.it_data = NULL;
+       }
+
+       LASSERT(fid_is_sane(&body->fid1));
+
+       tgt = lmv_find_target(lmv, &body->fid1);
+       if (IS_ERR(tgt))
+               GOTO(out, rc = PTR_ERR(tgt));
+
+       OBD_ALLOC_PTR(op_data);
+       if (op_data == NULL)
+               GOTO(out, rc = -ENOMEM);
+
+       op_data->op_fid1 = body->fid1;
+       /* Sent the parent FID to the remote MDT */
+       if (parent_fid != NULL) {
+               /* The parent fid is only for remote open to
+                * check whether the open is from OBF,
+                * see mdt_cross_open */
+               LASSERT(it->it_op & IT_OPEN);
+               op_data->op_fid2 = *parent_fid;
+               /* Add object FID to op_fid3, in case it needs to check stale
+                * (M_CHECK_STALE), see mdc_finish_intent_lock */
+               op_data->op_fid3 = body->fid1;
+       }
+
+       op_data->op_bias = MDS_CROSS_REF;
+       CDEBUG(D_INODE, "REMOTE_INTENT with fid="DFID" -> mds #%d\n",
+              PFID(&body->fid1), tgt->ltd_idx);
+
+       rc = md_intent_lock(tgt->ltd_exp, op_data, it, &req, cb_blocking,
+                           extra_lock_flags);
+        if (rc)
+                GOTO(out_free_op_data, rc);
+
+       /*
+        * LLite needs LOOKUP lock to track dentry revocation in order to
+        * maintain dcache consistency. Thus drop UPDATE|PERM lock here
+        * and put LOOKUP in request.
+        */
+       if (it->d.lustre.it_lock_mode != 0) {
+               it->d.lustre.it_remote_lock_handle =
+                                       it->d.lustre.it_lock_handle;
+               it->d.lustre.it_remote_lock_mode = it->d.lustre.it_lock_mode;
+       }
+
+       if (pmode) {
+               it->d.lustre.it_lock_handle = plock.cookie;
+               it->d.lustre.it_lock_mode = pmode;
+       }
+
+       EXIT;
+out_free_op_data:
+       OBD_FREE_PTR(op_data);
+out:
+       if (rc && pmode)
+               ldlm_lock_decref(&plock, pmode);
+
+       ptlrpc_req_finished(*reqp);
+       *reqp = req;
+       return rc;
 }
 
-int lmv_handle_remote_inode(struct obd_export *exp, void *lmm,
-                            int lmmsize, struct lookup_intent *it,
-                            int flags, struct ptlrpc_request **reqp,
-                            ldlm_blocking_callback cb_blocking)
+#ifdef __KERNEL__
+int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
+                         struct lmv_stripe_md *lsm,
+                         ldlm_blocking_callback cb_blocking,
+                         int extra_lock_flags)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct mds_body *body = NULL;
-        int rc = 0;
-        ENTRY;
-
-        body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
-        LASSERT(body != NULL);
-
-        if (body->valid & OBD_MD_MDS) {
-                /*
-                 * oh, MDS reports that this is remote inode case i.e. we have
-                 * to ask for real attrs on another MDS.
-                 */
-                struct ptlrpc_request *req = NULL;
-                struct lustre_handle plock;
-                struct lustre_id nid;
-                int pmode;
-
-                if (it->it_op == IT_LOOKUP || it->it_op == IT_CHDIR) {
-                        /*
-                         * unfortunately, we have to lie to MDC/MDS to retrieve
-                         * attributes llite needs.
-                         */
-                        it->it_op = IT_GETATTR;
-                }
-
-                /* we got LOOKUP lock, but we really need attrs */
-                pmode = LUSTRE_IT(it)->it_lock_mode;
-                if (pmode) {
-                        memcpy(&plock, &LUSTRE_IT(it)->it_lock_handle,
-                               sizeof(plock));
-                        LUSTRE_IT(it)->it_lock_mode = 0;
-                }
-
-                LASSERT((body->valid & OBD_MD_FID) != 0);
-                
-                nid = body->id1;
-                LUSTRE_IT(it)->it_disposition &= ~DISP_ENQ_COMPLETE;
-                rc = md_intent_lock(lmv->tgts[id_group(&nid)].ltd_exp, &nid, NULL,
-                                    0, lmm, lmmsize, NULL, it, flags, &req, cb_blocking);
-
-                /*
-                 * llite needs LOOKUP lock to track dentry revocation in order
-                 * to maintain dcache consistency. Thus drop UPDATE lock here
-                 * and put LOOKUP in request.
-                 */
-                if (rc == 0) {
-                        lmv_drop_intent_lock(it);
-                        memcpy(&LUSTRE_IT(it)->it_lock_handle, &plock,
-                               sizeof(plock));
-                        LUSTRE_IT(it)->it_lock_mode = pmode;
-                } else if (pmode)
-                        ldlm_lock_decref(&plock, pmode);
-
-                ptlrpc_req_finished(*reqp);
-                *reqp = req;
-        }
-        RETURN(rc);
+       struct obd_device      *obd = exp->exp_obd;
+       struct lmv_obd         *lmv = &obd->u.lmv;
+       struct mdt_body         *body;
+       struct md_op_data      *op_data;
+       unsigned long           size = 0;
+       unsigned long           nlink = 0;
+       obd_time                atime = 0;
+       obd_time                ctime = 0;
+       obd_time                mtime = 0;
+       int                     i;
+       int                     rc = 0;
+
+       ENTRY;
+
+       /**
+        * revalidate slaves has some problems, temporarily return,
+        * we may not need that
+        */
+       OBD_ALLOC_PTR(op_data);
+       if (op_data == NULL)
+               RETURN(-ENOMEM);
+
+       /**
+        * Loop over the stripe information, check validity and update them
+        * from MDS if needed.
+        */
+       for (i = 0; i < lsm->lsm_md_stripe_count; i++) {
+               struct lu_fid           fid;
+               struct lookup_intent    it = { .it_op = IT_GETATTR };
+               struct ptlrpc_request   *req = NULL;
+               struct lustre_handle    *lockh = NULL;
+               struct lmv_tgt_desc     *tgt = NULL;
+               struct inode            *inode;
+
+               fid = lsm->lsm_md_oinfo[i].lmo_fid;
+               inode = lsm->lsm_md_oinfo[i].lmo_root;
+
+               /*
+                * Prepare op_data for revalidating. Note that @fid2 shluld be
+                * defined otherwise it will go to server and take new lock
+                * which is not needed here.
+                */
+               memset(op_data, 0, sizeof(*op_data));
+               op_data->op_fid1 = fid;
+               op_data->op_fid2 = fid;
+
+               tgt = lmv_locate_mds(lmv, op_data, &fid);
+               if (IS_ERR(tgt))
+                       GOTO(cleanup, rc = PTR_ERR(tgt));
+
+               CDEBUG(D_INODE, "Revalidate slave "DFID" -> mds #%d\n",
+                      PFID(&fid), tgt->ltd_idx);
+
+               rc = md_intent_lock(tgt->ltd_exp, op_data, &it, &req,
+                                   cb_blocking, extra_lock_flags);
+               if (rc < 0)
+                       GOTO(cleanup, rc);
+
+               lockh = (struct lustre_handle *)&it.d.lustre.it_lock_handle;
+               if (rc > 0 && req == NULL) {
+                       /* slave inode is still valid */
+                       CDEBUG(D_INODE, "slave "DFID" is still valid.\n",
+                              PFID(&fid));
+                       rc = 0;
+               } else {
+                       /* refresh slave from server */
+                       body = req_capsule_server_get(&req->rq_pill,
+                                                     &RMF_MDT_BODY);
+                       LASSERT(body != NULL);
+                       if (unlikely(body->nlink < 2)) {
+                               CERROR("%s: nlink %d < 2 corrupt stripe %d "DFID
+                                      ":" DFID"\n", obd->obd_name, body->nlink,
+                                      i, PFID(&lsm->lsm_md_oinfo[i].lmo_fid),
+                                      PFID(&lsm->lsm_md_oinfo[0].lmo_fid));
+
+                               if (req != NULL)
+                                       ptlrpc_req_finished(req);
+
+                               if (it.d.lustre.it_lock_mode && lockh) {
+                                       ldlm_lock_decref(lockh,
+                                                it.d.lustre.it_lock_mode);
+                                       it.d.lustre.it_lock_mode = 0;
+                               }
+
+                               GOTO(cleanup, rc = -EIO);
+                       }
+
+
+                       i_size_write(inode, body->size);
+                       set_nlink(inode, body->nlink);
+                       LTIME_S(inode->i_atime) = body->atime;
+                       LTIME_S(inode->i_ctime) = body->ctime;
+                       LTIME_S(inode->i_mtime) = body->mtime;
+
+                       if (req != NULL)
+                               ptlrpc_req_finished(req);
+               }
+
+               md_set_lock_data(tgt->ltd_exp, &lockh->cookie, inode, NULL);
+
+               size += i_size_read(inode);
+
+               if (i != 0)
+                       nlink += inode->i_nlink - 2;
+               else
+                       nlink += inode->i_nlink;
+
+               atime = LTIME_S(inode->i_atime) > atime ?
+                               LTIME_S(inode->i_atime) : atime;
+               ctime = LTIME_S(inode->i_ctime) > ctime ?
+                               LTIME_S(inode->i_ctime) : ctime;
+               mtime = LTIME_S(inode->i_mtime) > mtime ?
+                               LTIME_S(inode->i_mtime) : mtime;
+
+               if (it.d.lustre.it_lock_mode != 0 && lockh != NULL) {
+                       ldlm_lock_decref(lockh, it.d.lustre.it_lock_mode);
+                       it.d.lustre.it_lock_mode = 0;
+               }
+
+               CDEBUG(D_INODE, "i %d "DFID" size %llu, nlink %u, atime "
+                      "%lu, mtime %lu, ctime %lu.\n", i, PFID(&fid),
+                      i_size_read(inode), inode->i_nlink,
+                      LTIME_S(inode->i_atime), LTIME_S(inode->i_mtime),
+                      LTIME_S(inode->i_ctime));
+       }
+
+       /*
+        * update attr of master request.
+        */
+       CDEBUG(D_INODE, "Return refreshed attrs: size = %lu nlink %lu atime "
+              LPU64 "ctime "LPU64" mtime "LPU64" for " DFID"\n", size, nlink,
+              atime, ctime, mtime, PFID(&lsm->lsm_md_oinfo[0].lmo_fid));
+
+       if (mbody != NULL) {
+               mbody->atime = atime;
+               mbody->ctime = ctime;
+               mbody->mtime = mtime;
+       }
+cleanup:
+       OBD_FREE_PTR(op_data);
+       RETURN(rc);
 }
 
-int lmv_intent_open(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 flags, struct ptlrpc_request **reqp,
-                    ldlm_blocking_callback cb_blocking)
-{
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct mds_body *body = NULL;
-        struct lustre_id rpid = *pid;
-        int rc, mds, loop = 0;
-        struct lmv_obj *obj;
-        struct mea *mea;
-        ENTRY;
-
-        /* IT_OPEN is intended to open (and create, possible) an object. Parent
-         * (pid) may be splitted dir */
-
-repeat:
-        LASSERT(++loop <= 2);
-        mds = id_group(&rpid);
-        obj = lmv_grab_obj(obd, &rpid);
-        if (obj) {
-                /* directory is already splitted, so we have to forward
-                 * request to the right MDS */
-                mds = raw_name2idx(obj->hashtype, obj->objcount, 
-                                   (char *)name, len);
-                
-                CDEBUG(D_OTHER, "forward to MDS #%u ("DLID4")\n",
-                       mds, OLID4(&rpid));
-                rpid = obj->objs[mds].id;
-                lmv_put_obj(obj);
-        }
-
-        rc = md_intent_lock(lmv->tgts[id_group(&rpid)].ltd_exp, &rpid, name,
-                            len, lmm, lmmsize, cid, it, flags, reqp, cb_blocking);
-        if (rc == -ERESTART) {
-                /* directory got splitted. time to update local object and
-                 * repeat the request with proper MDS */
-                LASSERT(id_equal_fid(pid, &rpid));
-                rc = lmv_get_mea_and_update_object(exp, &rpid);
-                if (rc == 0) {
-                        ptlrpc_req_finished(*reqp);
-                        goto repeat;
-                }
-        }
-        if (rc != 0)
-                RETURN(rc);
-
-        /* okay, MDS has returned success. Probably name has been resolved in
-         * remote inode */
-        rc = lmv_handle_remote_inode(exp, lmm, lmmsize, it,
-                                     flags, reqp, cb_blocking);
-        if (rc != 0) {
-                LASSERT(rc < 0);
-
-                /* 
-                 * this is possible, that some userspace application will try to
-                 * open file as directory and we will have error -20 here. As
-                 * this is "usual" situation, we should not print error here,
-                 * only debug info.
-                 */
-                CDEBUG(D_OTHER, "can't handle remote %s: dir "DLID4"("DLID4"):"
-                       "%*s: %d\n", LL_IT2STR(it), OLID4(pid), OLID4(&rpid),
-                       len, name, rc);
-                RETURN(rc);
-        }
-
-        /*
-         * nothing is found, do not access body->id1 as it is zero and thus
-         * pointless.
-         */
-        if (LUSTRE_IT(it)->it_disposition & DISP_LOOKUP_NEG)
-                RETURN(0);
-
-        /* caller may use attrs MDS returns on IT_OPEN lock request so, we have
-         * to update them for splitted dir */
-        body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
-        LASSERT(body != NULL);
-        LASSERT((body->valid & OBD_MD_FID) != 0);
-        
-        cid = &body->id1;
-        obj = lmv_grab_obj(obd, cid);
-        if (!obj && (mea = lmv_splitted_dir_body(*reqp, 1))) {
-                /* wow! this is splitted dir, we'd like to handle it */
-                obj = lmv_create_obj(exp, &body->id1, mea);
-                if (IS_ERR(obj))
-                        RETURN(PTR_ERR(obj));
-        }
-
-        if (obj) {
-                /* this is splitted dir and we'd want to get attrs */
-                CDEBUG(D_OTHER, "attrs from slaves for "DLID4"\n",
-                       OLID4(cid));
-                
-                rc = lmv_revalidate_slaves(exp, reqp, cid, it, 1,
-                                           cb_blocking);
-        } else if (S_ISDIR(body->mode)) {
-                CDEBUG(D_OTHER, "object "DLID4" has not lmv obj?\n",
-                       OLID4(cid));
-        }
-        
-        if (obj)
-                lmv_put_obj(obj);
-        
-        RETURN(rc);
-}
+#else
 
-int lmv_intent_getattr(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 flags, struct ptlrpc_request **reqp,
-                       ldlm_blocking_callback cb_blocking)
+int lmv_revalidate_slaves(struct obd_export *exp, struct mdt_body *mbody,
+                         struct lmv_stripe_md *lsm,
+                         ldlm_blocking_callback cb_blocking,
+                         int extra_lock_flags)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct mds_body *body = NULL;
-        struct lustre_id rpid = *pid;
-        struct lmv_obj *obj = NULL, *obj2 = NULL;
-        struct mea *mea;
-        int rc = 0, mds;
-        ENTRY;
-
-        if (cid) {
-                /* caller wants to revalidate attrs of obj we have to revalidate
-                 * slaves if requested object is splitted directory */
-                CDEBUG(D_OTHER, "revalidate attrs for "DLID4"\n", OLID4(cid));
-                mds = id_group(cid);
-#if 0
-                obj = lmv_grab_obj(obd, cid);
-                if (obj) {
-                        /* in fact, we need not this with current intent_lock(),
-                         * but it may change some day */
-                        if (!id_equal_fid(pid, cid)){
-                                rpid = obj->objs[mds].id;
-                                mds = id_group(&rpid);
-                        }
-                        lmv_put_obj(obj);
-                }
-#endif
-        } else {
-                CDEBUG(D_OTHER, "INTENT getattr for %*s on "DLID4"\n",
-                       len, name, OLID4(pid));
-                mds = id_group(pid);
-                obj = lmv_grab_obj(obd, pid);
-                if (obj && len) {
-                        /* directory is already splitted. calculate mds */
-                        mds = raw_name2idx(obj->hashtype, obj->objcount, 
-                                           (char *)name, len);
-                        rpid = obj->objs[mds].id;
-                        mds = id_group(&rpid);
-                        lmv_put_obj(obj);
-
-                        CDEBUG(D_OTHER, "forward to MDS #%u (slave "DLID4")\n",
-                               mds, OLID4(&rpid));
-                }
-        }
-
-        /* the same about fid returning. */
-        rc = md_intent_lock(lmv->tgts[mds].ltd_exp, &rpid, name, len, lmm,
-                            lmmsize, cid, it, flags, reqp, cb_blocking);
-        if (rc < 0)
-                RETURN(rc);
-       
-        if (obj && rc > 0) {
-                /* this is splitted dir. In order to optimize things a
-                 * bit, we consider obj valid updating missing parts.
-
-                 * FIXME: do we need to return any lock here? It would
-                 * be fine if we don't. this means that nobody should
-                 * use UPDATE lock to notify about object * removal */
-                CDEBUG(D_OTHER,
-                       "revalidate slaves for "DLID4", rc %d\n",
-                       OLID4(cid), rc);
-                
-                LASSERT(cid != 0);
-                rc = lmv_revalidate_slaves(exp, reqp, cid, it, rc,
-                                           cb_blocking);
-                RETURN(rc);
-        }
-
-        if (*reqp == NULL)
-                RETURN(rc);
-        /* okay, MDS has returned success. probably name has been
-         * resolved in remote inode */
-        rc = lmv_handle_remote_inode(exp, lmm, lmmsize, it,
-                                     flags, reqp, cb_blocking);
-        if (rc < 0)
-                RETURN(rc);
-
-        /*
-         * nothing is found, do not access body->id1 as it is zero and thus
-         * pointless.
-         */
-        if (LUSTRE_IT(it)->it_disposition & DISP_LOOKUP_NEG)
-                RETURN(0);
-                
-        body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
-        LASSERT(body != NULL);
-        LASSERT((body->valid & OBD_MD_FID) != 0);
-
-        cid = &body->id1;
-        obj2 = lmv_grab_obj(obd, cid);
-
-        if (!obj2 && (mea = lmv_splitted_dir_body(*reqp, 1))) {
-                /* wow! this is splitted dir, we'd like to handle it. */
-                body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
-                LASSERT(body != NULL);
-
-                obj2 = lmv_create_obj(exp, &body->id1, mea);
-                if (IS_ERR(obj2))
-                        RETURN(PTR_ERR(obj2));
-        }
-
-        if (obj2) {
-                /* this is splitted dir and we'd want to get attrs */
-                CDEBUG(D_OTHER, "attrs from slaves for "DLID4", rc %d\n",
-                       OLID4(cid), rc);
-                
-                rc = lmv_revalidate_slaves(exp, reqp, cid, it, 1,
-                                           cb_blocking);
-                lmv_put_obj(obj2);
-        }
-        RETURN(rc);
+       return 0;
 }
 
-void lmv_update_body_from_obj(struct mds_body *body, struct lmv_inode *obj)
-{
-        /* update size */
-        body->size += obj->size;
-}
+#endif
 
-int lmv_lookup_slaves(struct obd_export *exp, struct ptlrpc_request **reqp)
+/*
+ * IT_OPEN is intended to open (and create, possible) an object. Parent (pid)
+ * may be split dir.
+ */
+int lmv_intent_open(struct obd_export *exp, struct md_op_data *op_data,
+                   struct lookup_intent *it, struct ptlrpc_request **reqp,
+                   ldlm_blocking_callback cb_blocking, __u64 extra_lock_flags)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct mds_body *body = NULL;
-        struct lustre_handle *lockh;
-        struct ldlm_lock *lock;
-        struct mds_body *body2;
-        struct lmv_obj *obj;
-        int i, rc = 0;
-        ENTRY;
-
-        LASSERT(reqp);
-        LASSERT(*reqp);
-
-        /* master is locked. we'd like to take locks on slaves and update
-         * attributes to be returned from the slaves it's important that lookup
-         * is called in two cases:
-         
-         *  - for first time (dcache has no such a resolving yet).
-         *  - ->d_revalidate() returned false.
-         
-         * last case possible only if all the objs (master and all slaves aren't
-         * valid */
-
-        body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
-        LASSERT(body != NULL);
-        LASSERT((body->valid & OBD_MD_FID) != 0);
-
-        obj = lmv_grab_obj(obd, &body->id1);
-        LASSERT(obj != NULL);
-
-        CDEBUG(D_OTHER, "lookup slaves for "DLID4"\n", 
-               OLID4(&body->id1));
-
-        lmv_lock_obj(obj);
-        
-        for (i = 0; i < obj->objcount; i++) {
-                struct lustre_id id = obj->objs[i].id;
-                struct ptlrpc_request *req = NULL;
-                struct lookup_intent it;
-
-                if (id_equal_fid(&id, &obj->id))
-                        /* skip master obj */
-                        continue;
-
-                CDEBUG(D_OTHER, "lookup slave "DLID4"\n", OLID4(&id));
-
-                /* is obj valid? */
-                memset(&it, 0, sizeof(it));
-                it.it_op = IT_GETATTR;
-                OBD_ALLOC(it.d.fs_data, sizeof(struct lustre_intent_data));
-
-                rc = md_intent_lock(lmv->tgts[id_group(&id)].ltd_exp, &id,
-                                    NULL, 0, NULL, 0, &id, &it, 0, &req,
-                                    lmv_dirobj_blocking_ast);
-                
-                lockh = (struct lustre_handle *)&LUSTRE_IT(&it)->it_lock_handle;
-                if (rc > 0 && req == NULL) {
-                        /* nice, this slave is valid */
-                        LASSERT(req == NULL);
-                        CDEBUG(D_OTHER, "cached\n");
-                        goto release_lock;
-                }
-
-                if (rc < 0) {
-                        OBD_FREE(it.d.fs_data, sizeof(struct lustre_intent_data));
-                        /* error during lookup */
-                        GOTO(cleanup, rc);
-                } 
-                lock = ldlm_handle2lock(lockh);
-                LASSERT(lock);
-
-                lock->l_ast_data = lmv_get_obj(obj);
-
-                body2 = lustre_msg_buf(req->rq_repmsg, 1, sizeof(*body2));
-                LASSERT(body2);
-
-                obj->objs[i].size = body2->size;
-                
-                CDEBUG(D_OTHER, "fresh: %lu\n",
-                       (unsigned long)obj->objs[i].size);
-
-                LDLM_LOCK_PUT(lock);
-
-                if (req)
-                        ptlrpc_req_finished(req);
-release_lock:
-                lmv_update_body_from_obj(body, obj->objs + i);
-
-                if (LUSTRE_IT(&it)->it_lock_mode)
-                        ldlm_lock_decref(lockh, LUSTRE_IT(&it)->it_lock_mode);
-                OBD_FREE(it.d.fs_data, sizeof(struct lustre_intent_data));
-        }
-
-        EXIT;
-cleanup:
-        lmv_unlock_obj(obj);
-        lmv_put_obj(obj);
-        return rc;
+       struct obd_device       *obd = exp->exp_obd;
+       struct lmv_obd          *lmv = &obd->u.lmv;
+       struct lmv_tgt_desc     *tgt;
+       struct mdt_body         *body;
+       int                     rc;
+       ENTRY;
+
+       /* Note: client might open with some random flags(sanity 33b), so we can
+        * not make sure op_fid2 is being initialized with BY_FID flag */
+       if (it->it_flags & MDS_OPEN_BY_FID && fid_is_sane(&op_data->op_fid2)) {
+               if (op_data->op_mea1 != NULL) {
+                       struct lmv_stripe_md    *lsm = op_data->op_mea1;
+                       const struct lmv_oinfo  *oinfo;
+
+                       oinfo = lsm_name_to_stripe_info(lsm, op_data->op_name,
+                                                       op_data->op_namelen);
+                       if (IS_ERR(oinfo))
+                               RETURN(PTR_ERR(oinfo));
+                       op_data->op_fid1 = oinfo->lmo_fid;
+               }
+
+               tgt = lmv_find_target(lmv, &op_data->op_fid2);
+               if (IS_ERR(tgt))
+                       RETURN(PTR_ERR(tgt));
+
+               op_data->op_mds = tgt->ltd_idx;
+       } else {
+               tgt = lmv_locate_mds(lmv, op_data, &op_data->op_fid1);
+               if (IS_ERR(tgt))
+                       RETURN(PTR_ERR(tgt));
+       }
+
+       /* If it is ready to open the file by FID, do not need
+        * allocate FID at all, otherwise it will confuse MDT */
+       if ((it->it_op & IT_CREAT) &&
+           !(it->it_flags & MDS_OPEN_BY_FID)) {
+               /*
+                * For open with IT_CREATE and for IT_CREATE cases allocate new
+                * fid and setup FLD for it.
+                */
+               op_data->op_fid3 = op_data->op_fid2;
+               rc = lmv_fid_alloc(NULL, exp, &op_data->op_fid2, op_data);
+               if (rc != 0)
+                       RETURN(rc);
+       }
+
+       CDEBUG(D_INODE, "OPEN_INTENT with fid1="DFID", fid2="DFID","
+              " name='%s' -> mds #%d\n", PFID(&op_data->op_fid1),
+              PFID(&op_data->op_fid2), op_data->op_name, tgt->ltd_idx);
+
+       rc = md_intent_lock(tgt->ltd_exp, op_data, it, reqp, cb_blocking,
+                           extra_lock_flags);
+       if (rc != 0)
+               RETURN(rc);
+       /*
+        * Nothing is found, do not access body->fid1 as it is zero and thus
+        * pointless.
+        */
+       if ((it->d.lustre.it_disposition & DISP_LOOKUP_NEG) &&
+           !(it->d.lustre.it_disposition & DISP_OPEN_CREATE) &&
+           !(it->d.lustre.it_disposition & DISP_OPEN_OPEN))
+               RETURN(rc);
+
+       body = req_capsule_server_get(&(*reqp)->rq_pill, &RMF_MDT_BODY);
+       if (body == NULL)
+               RETURN(-EPROTO);
+
+       /* Not cross-ref case, just get out of here. */
+       if (unlikely((body->valid & OBD_MD_MDS))) {
+               rc = lmv_intent_remote(exp, it, &op_data->op_fid1, reqp,
+                                      cb_blocking, extra_lock_flags);
+               if (rc != 0)
+                       RETURN(rc);
+
+               body = req_capsule_server_get(&(*reqp)->rq_pill, &RMF_MDT_BODY);
+               if (body == NULL)
+                       RETURN(-EPROTO);
+       }
+
+       RETURN(rc);
 }
 
-int lmv_intent_lookup(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 flags, struct ptlrpc_request **reqp,
-                      ldlm_blocking_callback cb_blocking)
+/*
+ * Handler for: getattr, lookup and revalidate cases.
+ */
+static int
+lmv_intent_lookup(struct obd_export *exp, struct md_op_data *op_data,
+                 struct lookup_intent *it, struct ptlrpc_request **reqp,
+                 ldlm_blocking_callback cb_blocking,
+                 __u64 extra_lock_flags)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct mds_body *body = NULL;
-        struct lustre_id rpid = *pid;
-        struct lmv_obj *obj;
-        struct mea *mea;
-        int rc, mds, loop = 0;
-        ENTRY;
-
-        /*
-         * IT_LOOKUP is intended to produce name -> id resolving (let's call
-         * this lookup below) or to confirm requested resolving is still valid
-         * (let's call this revalidation) cid != NULL specifies revalidation.
-         */
-        if (cid) {
-                /*
-                 * this is revalidation: we have to check is LOOKUP lock still
-                 * valid for given id. Very important part is that we have to
-                 * choose right mds because namespace is per mds.
-                 */
-                rpid = *pid;
-                obj = lmv_grab_obj(obd, pid);
-                if (obj) {
-                        mds = raw_name2idx(obj->hashtype, obj->objcount,
-                                           (char *)name, len);
-                        rpid = obj->objs[mds].id;
-                        lmv_put_obj(obj);
-                }
-                mds = id_group(&rpid);
-
-                CDEBUG(D_OTHER, "revalidate lookup for "DLID4" to %d MDS\n",
-                       OLID4(cid), mds);
-
-        } else {
-                mds = id_group(pid);
-repeat:
-                LASSERT(++loop <= 2);
-                
-                /* this is lookup. during lookup we have to update all the
-                 * attributes, because returned values will be put in struct
-                 * inode */
-
-                obj = lmv_grab_obj(obd, pid);
-                if (obj) {
-                        if (len) {
-                                /* directory is already splitted. calculate mds */
-                                mds = raw_name2idx(obj->hashtype, obj->objcount, 
-                                                   (char *)name, len);
-                                rpid = obj->objs[mds].id;
-                                mds = id_group(&rpid);
-                        }
-                        lmv_put_obj(obj);
-                }
-        }
-        rc = md_intent_lock(lmv->tgts[mds].ltd_exp, &rpid, name,
-                            len, lmm, lmmsize, cid, it, flags,
-                            reqp, cb_blocking);
-        if (rc > 0) {
-                LASSERT(cid != 0);
-                RETURN(rc);
-        }
-        if (rc > 0) {
-                /* very interesting. it seems object is still valid but for some
-                 * reason llite calls lookup, not revalidate */
-                CDEBUG(D_OTHER, "lookup for "DLID4" and data should be uptodate\n",
-                      OLID4(&rpid));
-                LASSERT(*reqp == NULL);
-                RETURN(rc);
-        }
-
-        if (rc == 0 && *reqp == NULL) {
-                /* once again, we're asked for lookup, not revalidate */
-                CDEBUG(D_OTHER, "lookup for "DLID4" and data should be uptodate\n",
-                      OLID4(&rpid));
-                RETURN(rc);
-        }
-       
-        if (rc == -ERESTART) {
-                /* directory got splitted since last update. this shouldn't be
-                 * becasue splitting causes lock revocation, so revalidate had
-                 * to fail and lookup on dir had to return mea */
-                CWARN("we haven't knew about directory splitting!\n");
-                LASSERT(obj == NULL);
-
-                obj = lmv_create_obj(exp, &rpid, NULL);
-                if (IS_ERR(obj))
-                        RETURN(PTR_ERR(obj));
-                lmv_put_obj(obj);
-                goto repeat;
-        }
-
-        if (rc < 0)
-                RETURN(rc);
-
-        /* okay, MDS has returned success. Probably name has been resolved in
-         * remote inode. */
-        rc = lmv_handle_remote_inode(exp, lmm, lmmsize, it,
-                                     flags, reqp, cb_blocking);
-
-        if (rc == 0 && (mea = lmv_splitted_dir_body(*reqp, 1))) {
-                /* wow! this is splitted dir, we'd like to handle it */
-                body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
-                LASSERT(body != NULL);
-                LASSERT((body->valid & OBD_MD_FID) != 0);
-                
-                obj = lmv_grab_obj(obd, &body->id1);
-                if (!obj) {
-                        obj = lmv_create_obj(exp, &body->id1, mea);
-                        if (IS_ERR(obj))
-                                RETURN(PTR_ERR(obj));
-                }
-                lmv_put_obj(obj);
-        }
-
-        RETURN(rc);
+       struct obd_device       *obd = exp->exp_obd;
+       struct lmv_obd          *lmv = &obd->u.lmv;
+       struct lmv_tgt_desc     *tgt = NULL;
+       struct mdt_body         *body;
+       struct lmv_stripe_md    *lsm = op_data->op_mea1;
+       int                     rc = 0;
+       ENTRY;
+
+       tgt = lmv_locate_mds(lmv, op_data, &op_data->op_fid1);
+       if (IS_ERR(tgt))
+               RETURN(PTR_ERR(tgt));
+
+       if (!fid_is_sane(&op_data->op_fid2))
+               fid_zero(&op_data->op_fid2);
+
+       CDEBUG(D_INODE, "LOOKUP_INTENT with fid1="DFID", fid2="DFID
+              ", name='%s' -> mds #%d lsm=%p lsm_magic=%x\n",
+              PFID(&op_data->op_fid1), PFID(&op_data->op_fid2),
+              op_data->op_name ? op_data->op_name : "<NULL>",
+              tgt->ltd_idx, lsm, lsm == NULL ? -1 : lsm->lsm_md_magic);
+
+       op_data->op_bias &= ~MDS_CROSS_REF;
+
+       rc = md_intent_lock(tgt->ltd_exp, op_data, it, reqp, cb_blocking,
+                           extra_lock_flags);
+       if (rc < 0)
+               RETURN(rc);
+
+       if (*reqp == NULL) {
+               /* If RPC happens, lsm information will be revalidated
+                * during update_inode process (see ll_update_lsm_md) */
+               if (op_data->op_mea2 != NULL) {
+                       rc = lmv_revalidate_slaves(exp, NULL, op_data->op_mea2,
+                                                  cb_blocking,
+                                                  extra_lock_flags);
+                       if (rc != 0)
+                               RETURN(rc);
+               }
+               RETURN(rc);
+       } else if (it_disposition(it, DISP_LOOKUP_NEG) && lsm != NULL &&
+                  lsm->lsm_md_hash_type & LMV_HASH_FLAG_MIGRATION) {
+               /* For migrating directory, if it can not find the child in
+                * the source directory(master stripe), try the targeting
+                * directory(stripe 1) */
+               tgt = lmv_find_target(lmv, &lsm->lsm_md_oinfo[1].lmo_fid);
+               if (IS_ERR(tgt))
+                       RETURN(PTR_ERR(tgt));
+
+               ptlrpc_req_finished(*reqp);
+               it->d.lustre.it_data = NULL;
+               *reqp = NULL;
+
+               CDEBUG(D_INODE, "For migrating dir, try target dir "DFID"\n",
+                      PFID(&lsm->lsm_md_oinfo[1].lmo_fid));
+
+               op_data->op_fid1 = lsm->lsm_md_oinfo[1].lmo_fid;
+               it->d.lustre.it_disposition &= ~DISP_ENQ_COMPLETE;
+               rc = md_intent_lock(tgt->ltd_exp, op_data, it, reqp,
+                                   cb_blocking, extra_lock_flags);
+       }
+       /*
+        * MDS has returned success. Probably name has been resolved in
+        * remote inode. Let's check this.
+        */
+       body = req_capsule_server_get(&(*reqp)->rq_pill, &RMF_MDT_BODY);
+       if (body == NULL)
+               RETURN(-EPROTO);
+
+       /* Not cross-ref case, just get out of here. */
+       if (unlikely((body->valid & OBD_MD_MDS))) {
+               rc = lmv_intent_remote(exp, it, NULL, reqp, cb_blocking,
+                                      extra_lock_flags);
+               if (rc != 0)
+                       RETURN(rc);
+               body = req_capsule_server_get(&(*reqp)->rq_pill, &RMF_MDT_BODY);
+               if (body == NULL)
+                       RETURN(-EPROTO);
+       }
+
+       RETURN(rc);
 }
 
-int lmv_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 flags, struct ptlrpc_request **reqp,
-                    ldlm_blocking_callback cb_blocking)
+int lmv_intent_lock(struct obd_export *exp, struct md_op_data *op_data,
+                   struct lookup_intent *it, struct ptlrpc_request **reqp,
+                   ldlm_blocking_callback cb_blocking,
+                   __u64 extra_lock_flags)
 {
         struct obd_device *obd = exp->exp_obd;
-        int rc = 0;
+        int                rc;
         ENTRY;
 
-        LASSERT(it);
-        LASSERT(pid);
+        LASSERT(it != NULL);
+        LASSERT(fid_is_sane(&op_data->op_fid1));
 
-        CDEBUG(D_OTHER, "INTENT LOCK '%s' for '%*s' on %lu/%lu -> %lu\n",
-               LL_IT2STR(it), len, name, (unsigned long)id_ino(pid),
-               (unsigned long)id_gen(pid), (unsigned long)id_group(pid));
+        CDEBUG(D_INODE, "INTENT LOCK '%s' for '%*s' on "DFID"\n",
+               LL_IT2STR(it), op_data->op_namelen, op_data->op_name,
+               PFID(&op_data->op_fid1));
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        if (it->it_op == IT_LOOKUP)
-                rc = lmv_intent_lookup(exp, pid, name, len, lmm,
-                                       lmmsize, cid, it, flags, reqp,
-                                       cb_blocking);
-        else if (it->it_op & IT_OPEN)
-                rc = lmv_intent_open(exp, pid, name, len, lmm,
-                                     lmmsize, cid, it, flags, reqp,
-                                     cb_blocking);
-        else if (it->it_op == IT_GETATTR || it->it_op == IT_CHDIR)
-                rc = lmv_intent_getattr(exp, pid, name, len, lmm,
-                                        lmmsize, cid, it, flags, reqp,
-                                        cb_blocking);
-        else
-                LBUG();
-        RETURN(rc);
-}
-
-int lmv_revalidate_slaves(struct obd_export *exp, struct ptlrpc_request **reqp,
-                          struct lustre_id *mid, struct lookup_intent *oit,
-                          int master_valid, ldlm_blocking_callback cb_blocking)
-{
-        struct obd_device *obd = exp->exp_obd;
-        struct ptlrpc_request *mreq = *reqp;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct lustre_handle master_lockh;
-        struct ldlm_lock *lock;
-        unsigned long size = 0;
-        struct mds_body *body;
-        struct lmv_obj *obj;
-        int master_lock_mode;
-        int i, rc = 0;
-        ENTRY;
+       if (it->it_op & (IT_LOOKUP | IT_GETATTR | IT_LAYOUT))
+               rc = lmv_intent_lookup(exp, op_data, it, reqp, cb_blocking,
+                                      extra_lock_flags);
+       else if (it->it_op & IT_OPEN)
+               rc = lmv_intent_open(exp, op_data, it, reqp, cb_blocking,
+                                    extra_lock_flags);
+       else
+               LBUG();
 
-        /* we have to loop over the subobjects, check validity and update them
-         * from MDSs if needed. it's very useful that we need not to update all
-         * the fields. say, common fields (that are equal on all the subojects
-         * need not to be update, another fields (i_size, for example) are
-         * cached all the time */
-        obj = lmv_grab_obj(obd, mid);
-        LASSERT(obj != NULL);
-
-        master_lock_mode = 0;
-
-        lmv_lock_obj(obj);
-        
-        for (i = 0; i < obj->objcount; i++) {
-                struct lustre_id id = obj->objs[i].id;
-                struct lustre_handle *lockh = NULL;
-                struct ptlrpc_request *req = NULL;
-                ldlm_blocking_callback cb;
-                struct lookup_intent it;
-                int master = 0;
-
-                CDEBUG(D_OTHER, "revalidate subobj "DLID4"\n",
-                       OLID4(&id));
-
-                memset(&it, 0, sizeof(it));
-                it.it_op = IT_GETATTR;
-
-                cb = lmv_dirobj_blocking_ast;
-
-                OBD_ALLOC(it.d.fs_data, sizeof(struct lustre_intent_data));
-                if (id_equal_fid(&id, &obj->id)) {
-                        if (master_valid) {
-                                /* lmv_intent_getattr() already checked
-                                 * validness and took the lock */
-                                if (mreq) {
-                                        /* it even got the reply refresh attrs
-                                         * from that reply */
-                                        body = lustre_msg_buf(mreq->rq_repmsg,
-                                                              1, sizeof(*body));
-                                        LASSERT(body != NULL);
-                                        goto update; 
-                                }
-                                /* take already cached attrs into account */
-                                CDEBUG(D_OTHER,
-                                       "master is locked and cached\n");
-                                goto release_lock;
-                        }
-                        master = 1;
-                        cb = cb_blocking;
-                }
-
-               
-                /* is obj valid? */
-                rc = md_intent_lock(lmv->tgts[id_group(&id)].ltd_exp,
-                                    &id, NULL, 0, NULL, 0, &id, &it, 0, 
-                                    &req, cb);
-                lockh = (struct lustre_handle *) &LUSTRE_IT(&it)->it_lock_handle;
-                if (rc > 0 && req == NULL) {
-                        /* nice, this slave is valid */
-                        LASSERT(req == NULL);
-                        CDEBUG(D_OTHER, "cached\n");
-                        goto release_lock;
-                }
-
-                if (rc < 0) {
-                        OBD_FREE(it.d.fs_data, sizeof(struct lustre_intent_data));
-                        /* error during revalidation */
-                        GOTO(cleanup, rc);
-                }
-                if (master) {
-                        LASSERT(master_valid == 0);
-                        /* save lock on master to be returned to the caller */
-                        CDEBUG(D_OTHER, "no lock on master yet\n");
-                        memcpy(&master_lockh, lockh, sizeof(master_lockh));
-                        master_lock_mode = LUSTRE_IT(&it)->it_lock_mode;
-                        LUSTRE_IT(&it)->it_lock_mode = 0;
-                } else {
-                        /* this is slave. we want to control it */
-                        lock = ldlm_handle2lock(lockh);
-                        LASSERT(lock);
-                        lock->l_ast_data = lmv_get_obj(obj);
-                        LDLM_LOCK_PUT(lock);
-                }
-
-                if (*reqp == NULL) {
-                        /* this is first reply, we'll use it to return updated
-                         * data back to the caller */
-                        LASSERT(req);
-                        ptlrpc_request_addref(req);
-                        *reqp = req;
-
-                }
-
-                body = lustre_msg_buf(req->rq_repmsg, 1, sizeof(*body));
-                LASSERT(body);
-                
-update:
-                obj->objs[i].size = body->size;
-                
-                CDEBUG(D_OTHER, "fresh: %lu\n",
-                       (unsigned long)obj->objs[i].size);
-                
-                if (req)
-                        ptlrpc_req_finished(req);
-release_lock:
-                size += obj->objs[i].size;
-
-                if (LUSTRE_IT(&it)->it_lock_mode)
-                        ldlm_lock_decref(lockh, LUSTRE_IT(&it)->it_lock_mode);
-                OBD_FREE(it.d.fs_data, sizeof(struct lustre_intent_data));
-        }
-
-        if (*reqp) {
-                /* some attrs got refreshed, we have reply and it's time to put
-                 * fresh attrs to it */
-                CDEBUG(D_OTHER, "return refreshed attrs: size = %lu\n",
-                       (unsigned long)size);
-                
-                body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
-                LASSERT(body);
-
-                /* FIXME: what about other attributes? */
-                body->size = size;
-                
-                if (mreq == NULL) {
-                        /* very important to maintain id_group(lli->lli_id) the
-                         * same because of revalidation. mreq == NULL means that
-                         * caller has no reply and the only attr we can return
-                         * is size */
-                        body->valid = OBD_MD_FLSIZE;
-//                        body->mds = id_group(&obj->id);
-                }
-                if (master_valid == 0) {
-                        memcpy(&LUSTRE_IT(oit)->it_lock_handle,
-                               &master_lockh, sizeof(master_lockh));
-                        LUSTRE_IT(oit)->it_lock_mode = master_lock_mode;
-                }
-                rc = 0;
-        } else {
-                /* it seems all the attrs are fresh and we did no request */
-                CDEBUG(D_OTHER, "all the attrs were fresh\n");
-                if (master_valid == 0)
-                        LUSTRE_IT(oit)->it_lock_mode = master_lock_mode;
-                rc = 1;
-        }
-
-        EXIT;
-cleanup:
-        lmv_unlock_obj(obj);
-        lmv_put_obj(obj);
-        return rc;
+       RETURN(rc);
 }