Whamcloud - gitweb
LU-819 utils: Fix lfs getstripe -M
[fs/lustre-release.git] / lustre / lmv / lmv_obd.c
index 13aac50..d897826 100644 (file)
@@ -1,22 +1,40 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Copyright (C) 2002, 2003, 2004, 2005, 2006 Cluster File Systems, Inc.
+ * GPL HEADER START
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   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 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 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.
+ * 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).
  *
- *   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.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * Copyright (c) 2011 Whamcloud, Inc.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #ifndef EXPORT_SYMTAB
@@ -37,9 +55,6 @@
 #include <liblustre.h>
 #endif
 
-#include <linux/ext2_fs.h>
-
-#include <lustre/lustre_idl.h>
 #include <lustre_log.h>
 #include <obd_support.h>
 #include <lustre_lib.h>
 #include <lustre_fid.h>
 #include "lmv_internal.h"
 
-/* not defined for liblustre building */
-#if !defined(ATOMIC_INIT)
-#define ATOMIC_INIT(val) { (val) }
-#endif
-
 /* object cache. */
-cfs_mem_cache_t *obj_cache;
-atomic_t obj_cache_count = ATOMIC_INIT(0);
+cfs_mem_cache_t *lmv_object_cache;
+cfs_atomic_t lmv_object_count = CFS_ATOMIC_INIT(0);
 
 static void lmv_activate_target(struct lmv_obd *lmv,
                                 struct lmv_tgt_desc *tgt,
@@ -70,7 +80,8 @@ static void lmv_activate_target(struct lmv_obd *lmv,
         lmv->desc.ld_active_tgt_count += (activate ? 1 : -1);
 }
 
-/* Error codes:
+/**
+ * Error codes:
  *
  *  -EINVAL  : UUID can't be found in the LMV's target list
  *  -ENOTCONN: The UUID is found, but the target connection is bad (!)
@@ -79,20 +90,21 @@ static void lmv_activate_target(struct lmv_obd *lmv,
 static int lmv_set_mdc_active(struct lmv_obd *lmv, struct obd_uuid *uuid,
                               int activate)
 {
-        struct lmv_tgt_desc *tgt;
-        struct obd_device *obd;
-        int i, rc = 0;
+        struct lmv_tgt_desc    *tgt;
+        struct obd_device      *obd;
+        int                     i;
+        int                     rc = 0;
         ENTRY;
 
         CDEBUG(D_INFO, "Searching in lmv %p for uuid %s (activate=%d)\n",
                lmv, uuid->uuid, activate);
 
-        spin_lock(&lmv->lmv_lock);
+        cfs_spin_lock(&lmv->lmv_lock);
         for (i = 0, tgt = lmv->tgts; i < lmv->desc.ld_tgt_count; i++, tgt++) {
                 if (tgt->ltd_exp == NULL)
                         continue;
 
-                CDEBUG(D_INFO, "lmv idx %d is %s conn "LPX64"\n",
+                CDEBUG(D_INFO, "Target idx %d is %s conn "LPX64"\n",
                        i, tgt->ltd_uuid.uuid, tgt->ltd_exp->exp_handle.h_cookie);
 
                 if (obd_uuid_equals(uuid, &tgt->ltd_uuid))
@@ -117,28 +129,26 @@ static int lmv_set_mdc_active(struct lmv_obd *lmv, struct obd_uuid *uuid,
                 GOTO(out_lmv_lock, rc);
         }
 
-        CDEBUG(D_INFO, "Marking OBD %p %sactive\n",
-               obd, activate ? "" : "in");
-
+        CDEBUG(D_INFO, "Marking OBD %p %sactive\n", obd,
+               activate ? "" : "in");
         lmv_activate_target(lmv, tgt, activate);
-
         EXIT;
 
  out_lmv_lock:
-        spin_unlock(&lmv->lmv_lock);
+        cfs_spin_unlock(&lmv->lmv_lock);
         return rc;
 }
 
 static int lmv_set_mdc_data(struct lmv_obd *lmv, struct obd_uuid *uuid,
                             struct obd_connect_data *data)
 {
-        struct lmv_tgt_desc *tgt;
-        int i;
+        struct lmv_tgt_desc    *tgt;
+        int                     i;
         ENTRY;
 
         LASSERT(data != NULL);
 
-        spin_lock(&lmv->lmv_lock);
+        cfs_spin_lock(&lmv->lmv_lock);
         for (i = 0, tgt = lmv->tgts; i < lmv->desc.ld_tgt_count; i++, tgt++) {
                 if (tgt->ltd_exp == NULL)
                         continue;
@@ -148,16 +158,23 @@ static int lmv_set_mdc_data(struct lmv_obd *lmv, struct obd_uuid *uuid,
                         break;
                 }
         }
-        spin_unlock(&lmv->lmv_lock);
+        cfs_spin_unlock(&lmv->lmv_lock);
         RETURN(0);
 }
 
+struct obd_uuid *lmv_get_uuid(struct obd_export *exp) {
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        return obd_get_uuid(lmv->tgts[0].ltd_exp);
+}
+
 static int lmv_notify(struct obd_device *obd, struct obd_device *watched,
                       enum obd_notify_event ev, void *data)
 {
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_uuid *uuid;
-        int rc = 0;
+        struct obd_connect_data *conn_data;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct obd_uuid         *uuid;
+        int                      rc = 0;
         ENTRY;
 
         if (strcmp(watched->obd_type->typ_name, LUSTRE_MDC_NAME)) {
@@ -182,11 +199,11 @@ static int lmv_notify(struct obd_device *obd, struct obd_device *watched,
                         RETURN(rc);
                 }
         } else if (ev == OBD_NOTIFY_OCD) {
-                struct obd_connect_data *conn_data =
-                        &watched->u.cli.cl_import->imp_connect_data;
+                conn_data = &watched->u.cli.cl_import->imp_connect_data;
 
-                /* Set connect data to desired target, update
-                 * exp_connect_flags. */
+                /*
+                 * Set connect data to desired target, update exp_connect_flags.
+                 */
                 rc = lmv_set_mdc_data(lmv, uuid, conn_data);
                 if (rc) {
                         CERROR("can't set connect data to target %s, rc %d\n",
@@ -204,49 +221,58 @@ static int lmv_notify(struct obd_device *obd, struct obd_device *watched,
         }
 #if 0
         else if (ev == OBD_NOTIFY_DISCON) {
-                /* For disconnect event, flush fld cache for failout MDS case. */
+                /*
+                 * For disconnect event, flush fld cache for failout MDS case.
+                 */
                 fld_client_flush(&lmv->lmv_fld);
         }
 #endif
-        /* Pass the notification up the chain. */
+        /*
+         * Pass the notification up the chain.
+         */
         if (obd->obd_observer)
                 rc = obd_notify(obd->obd_observer, watched, ev, data);
 
         RETURN(rc);
 }
 
-/* this is fake connect function. Its purpose is to initialize lmv and say
- * caller that everything is okay. Real connection will be performed later. */
+/**
+ * This is fake connect function. Its purpose is to initialize lmv and say
+ * caller that everything is okay. Real connection will be performed later.
+ */
 static int lmv_connect(const struct lu_env *env,
-                       struct lustre_handle *conn, struct obd_device *obd,
+                       struct obd_export **exp, struct obd_device *obd,
                        struct obd_uuid *cluuid, struct obd_connect_data *data,
                        void *localdata)
 {
 #ifdef __KERNEL__
         struct proc_dir_entry *lmv_proc_dir;
 #endif
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *exp;
-        int rc = 0;
+        struct lmv_obd        *lmv = &obd->u.lmv;
+        struct lustre_handle  conn = { 0 };
+        int                    rc = 0;
         ENTRY;
 
-        rc = class_connect(conn, obd, cluuid);
+        /*
+         * We don't want to actually do the underlying connections more than
+         * once, so keep track.
+         */
+        lmv->refcount++;
+        if (lmv->refcount > 1) {
+                *exp = NULL;
+                RETURN(0);
+        }
+
+        rc = class_connect(&conn, obd, cluuid);
         if (rc) {
                 CERROR("class_connection() returned %d\n", rc);
                 RETURN(rc);
         }
 
-        exp = class_conn2export(conn);
+        *exp = class_conn2export(&conn);
+        class_export_get(*exp);
 
-        /* we don't want to actually do the underlying connections more than
-         * once, so keep track. */
-        lmv->refcount++;
-        if (lmv->refcount > 1) {
-                class_export_put(exp);
-                RETURN(0);
-        }
-
-        lmv->exp = exp;
+        lmv->exp = *exp;
         lmv->connected = 0;
         lmv->cluuid = *cluuid;
 
@@ -263,10 +289,12 @@ static int lmv_connect(const struct lu_env *env,
         }
 #endif
 
-        /* all real clients should perform actual connection right away, because
+        /*
+         * All real clients should perform actual connection right away, because
          * it is possible, that LMV will not have opportunity to connect targets
          * and MDC stuff will be called directly, for instance while reading
-         * ../mdc/../kbytesfree procfs file, etc. */
+         * ../mdc/../kbytesfree procfs file, etc.
+         */
         if (data->ocd_connect_flags & OBD_CONNECT_REAL)
                 rc = lmv_check_connect(obd);
 
@@ -282,9 +310,9 @@ static int lmv_connect(const struct lu_env *env,
 
 static void lmv_set_timeouts(struct obd_device *obd)
 {
-        struct lmv_tgt_desc *tgts;
-        struct lmv_obd *lmv;
-        int i;
+        struct lmv_tgt_desc   *tgts;
+        struct lmv_obd        *lmv;
+        int                    i;
 
         lmv = &obd->u.lmv;
         if (lmv->server_timeout == 0)
@@ -305,9 +333,11 @@ static void lmv_set_timeouts(struct obd_device *obd)
 static int lmv_init_ea_size(struct obd_export *exp, int easize,
                             int def_easize, int cookiesize)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        int i, rc = 0, change = 0;
+        struct obd_device   *obd = exp->exp_obd;
+        struct lmv_obd      *lmv = &obd->u.lmv;
+        int                  i;
+        int                  rc = 0;
+        int                  change = 0;
         ENTRY;
 
         if (lmv->max_easize < easize) {
@@ -349,28 +379,19 @@ static int lmv_init_ea_size(struct obd_export *exp, int easize,
 
 int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
 {
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_uuid *cluuid = &lmv->cluuid;
-        struct obd_connect_data *mdc_data = NULL;
-        struct obd_uuid lmv_mdc_uuid = { "LMV_MDC_UUID" };
-        struct lustre_handle conn = {0, };
-        struct obd_device *mdc_obd;
-        struct obd_export *mdc_exp;
-        struct lu_fld_target target;
-        int rc;
 #ifdef __KERNEL__
-        struct proc_dir_entry *lmv_proc_dir;
+        struct proc_dir_entry   *lmv_proc_dir;
 #endif
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct obd_uuid         *cluuid = &lmv->cluuid;
+        struct obd_connect_data *mdc_data = NULL;
+        struct obd_uuid          lmv_mdc_uuid = { "LMV_MDC_UUID" };
+        struct obd_device       *mdc_obd;
+        struct obd_export       *mdc_exp;
+        struct lu_fld_target     target;
+        int                      rc;
         ENTRY;
 
-        /* for MDS: don't connect to yourself */
-        if (obd_uuid_equals(&tgt->ltd_uuid, cluuid)) {
-                CDEBUG(D_CONFIG, "don't connect back to %s\n", cluuid->uuid);
-                /* XXX - the old code didn't increment active tgt count.
-                 *       should we ? */
-                RETURN(0);
-        }
-
         mdc_obd = class_find_client_obd(&tgt->ltd_uuid, LUSTRE_MDC_NAME,
                                         &obd->obd_uuid);
         if (!mdc_obd) {
@@ -388,21 +409,20 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
                 RETURN(-EINVAL);
         }
 
-        rc = obd_connect(NULL, &conn, mdc_obd, &lmv_mdc_uuid,
+        rc = obd_connect(NULL, &mdc_exp, mdc_obd, &lmv_mdc_uuid,
                          &lmv->conn_data, NULL);
         if (rc) {
                 CERROR("target %s connect error %d\n", tgt->ltd_uuid.uuid, rc);
                 RETURN(rc);
         }
 
-        mdc_exp = class_conn2export(&conn);
-
-        /* Init fid sequence client for this mdc. */
+        /*
+         * Init fid sequence client for this mdc and add new fld target.
+         */
         rc = obd_fid_init(mdc_exp);
         if (rc)
                 RETURN(rc);
 
-        /* Add new FLD target. */
         target.ft_srv = NULL;
         target.ft_exp = mdc_exp;
         target.ft_idx = tgt->ltd_idx;
@@ -420,7 +440,9 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
         }
 
         if (obd->obd_observer) {
-                /* tell the mds_lmv about the new target */
+                /*
+                 * Tell the observer about the new target.
+                 */
                 rc = obd_notify(obd->obd_observer, mdc_exp->exp_obd,
                                 OBD_NOTIFY_ACTIVE, (void *)(tgt - lmv->tgts));
                 if (rc) {
@@ -433,32 +455,32 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
         tgt->ltd_exp = mdc_exp;
         lmv->desc.ld_active_tgt_count++;
 
-        /* copy connect data, it may be used later */
+        /*
+         * Copy connect data, it may be used later.
+         */
         lmv->datas[tgt->ltd_idx] = *mdc_data;
 
         md_init_ea_size(tgt->ltd_exp, lmv->max_easize,
                         lmv->max_def_easize, lmv->max_cookiesize);
 
-        CDEBUG(D_CONFIG, "connected to %s(%s) successfully (%d)\n",
+        CDEBUG(D_CONFIG, "Connected to %s(%s) successfully (%d)\n",
                 mdc_obd->obd_name, mdc_obd->obd_uuid.uuid,
-                atomic_read(&obd->obd_refcount));
+                cfs_atomic_read(&obd->obd_refcount));
 
 #ifdef __KERNEL__
         lmv_proc_dir = lprocfs_srch(obd->obd_proc_entry, "target_obds");
         if (lmv_proc_dir) {
                 struct proc_dir_entry *mdc_symlink;
-                char name[MAX_STRING_SIZE + 1];
 
                 LASSERT(mdc_obd->obd_type != NULL);
                 LASSERT(mdc_obd->obd_type->typ_name != NULL);
-                name[MAX_STRING_SIZE] = '\0';
-                snprintf(name, MAX_STRING_SIZE, "../../../%s/%s",
-                         mdc_obd->obd_type->typ_name,
-                         mdc_obd->obd_name);
-                mdc_symlink = proc_symlink(mdc_obd->obd_name,
-                                           lmv_proc_dir, name);
+                mdc_symlink = lprocfs_add_symlink(mdc_obd->obd_name,
+                                                  lmv_proc_dir,
+                                                  "../../../%s/%s",
+                                                  mdc_obd->obd_type->typ_name,
+                                                  mdc_obd->obd_name);
                 if (mdc_symlink == NULL) {
-                        CERROR("could not register LMV target "
+                        CERROR("Could not register LMV target "
                                "/proc/fs/lustre/%s/%s/target_obds/%s.",
                                obd->obd_type->typ_name, obd->obd_name,
                                mdc_obd->obd_name);
@@ -472,18 +494,18 @@ int lmv_connect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
 
 int lmv_add_target(struct obd_device *obd, struct obd_uuid *tgt_uuid)
 {
-        struct lmv_obd *lmv = &obd->u.lmv;
+        struct lmv_obd      *lmv = &obd->u.lmv;
         struct lmv_tgt_desc *tgt;
-        int rc = 0;
+        int                  rc = 0;
         ENTRY;
 
-        CDEBUG(D_CONFIG, "tgt_uuid: %s.\n", tgt_uuid->uuid);
+        CDEBUG(D_CONFIG, "Target uuid: %s.\n", tgt_uuid->uuid);
 
         lmv_init_lock(lmv);
 
         if (lmv->desc.ld_active_tgt_count >= LMV_MAX_TGT_COUNT) {
                 lmv_init_unlock(lmv);
-                CERROR("can't add %s, LMV module compiled for %d MDCs. "
+                CERROR("Can't add %s, LMV module compiled for %d MDCs. "
                        "That many MDCs already configured.\n",
                        tgt_uuid->uuid, LMV_MAX_TGT_COUNT);
                 RETURN(-EINVAL);
@@ -499,24 +521,24 @@ int lmv_add_target(struct obd_device *obd, struct obd_uuid *tgt_uuid)
                         RETURN(-EINVAL);
                 }
 
-                rc = obd_llog_init(obd, OBD_LLOG_GROUP, mdc_obd, 0, NULL, tgt_uuid);
+                rc = obd_llog_init(obd, &obd->obd_olg, mdc_obd, NULL);
                 if (rc) {
                         lmv_init_unlock(lmv);
                         CERROR("lmv failed to setup llogging subsystems\n");
                 }
         }
-        spin_lock(&lmv->lmv_lock);
+        cfs_spin_lock(&lmv->lmv_lock);
         tgt = lmv->tgts + lmv->desc.ld_tgt_count++;
         tgt->ltd_uuid = *tgt_uuid;
-        spin_unlock(&lmv->lmv_lock);
+        cfs_spin_unlock(&lmv->lmv_lock);
 
         if (lmv->connected) {
                 rc = lmv_connect_mdc(obd, tgt);
                 if (rc) {
-                        spin_lock(&lmv->lmv_lock);
+                        cfs_spin_lock(&lmv->lmv_lock);
                         lmv->desc.ld_tgt_count--;
                         memset(tgt, 0, sizeof(*tgt));
-                        spin_unlock(&lmv->lmv_lock);
+                        cfs_spin_unlock(&lmv->lmv_lock);
                 } else {
                         int easize = sizeof(struct lmv_stripe_md) +
                                      lmv->desc.ld_tgt_count *
@@ -529,12 +551,13 @@ int lmv_add_target(struct obd_device *obd, struct obd_uuid *tgt_uuid)
         RETURN(rc);
 }
 
-/* performs a check if passed obd is connected. If no - connect it. */
 int lmv_check_connect(struct obd_device *obd)
 {
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct lmv_tgt_desc *tgt;
-        int i, rc, easize;
+        struct lmv_obd       *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc  *tgt;
+        int                   i;
+        int                   rc;
+        int                   easize;
         ENTRY;
 
         if (lmv->connected)
@@ -551,7 +574,7 @@ int lmv_check_connect(struct obd_device *obd)
                 RETURN(-EINVAL);
         }
 
-        CDEBUG(D_CONFIG, "time to connect %s to %s\n",
+        CDEBUG(D_CONFIG, "Time to connect %s to %s\n",
                lmv->cluuid.uuid, obd->obd_name);
 
         LASSERT(lmv->tgts != NULL);
@@ -579,7 +602,7 @@ int lmv_check_connect(struct obd_device *obd)
                         --lmv->desc.ld_active_tgt_count;
                         rc2 = obd_disconnect(tgt->ltd_exp);
                         if (rc2) {
-                                CERROR("error: LMV target %s disconnect on "
+                                CERROR("LMV target %s disconnect on "
                                        "MDC idx %d: error %d\n",
                                        tgt->ltd_uuid.uuid, i, rc2);
                         }
@@ -593,11 +616,11 @@ int lmv_check_connect(struct obd_device *obd)
 static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
 {
 #ifdef __KERNEL__
-        struct proc_dir_entry *lmv_proc_dir;
+        struct proc_dir_entry  *lmv_proc_dir;
 #endif
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_device *mdc_obd;
-        int rc;
+        struct lmv_obd         *lmv = &obd->u.lmv;
+        struct obd_device      *mdc_obd;
+        int                     rc;
         ENTRY;
 
         LASSERT(tgt != NULL);
@@ -605,8 +628,11 @@ static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
 
         mdc_obd = class_exp2obd(tgt->ltd_exp);
 
-        if (mdc_obd)
+        if (mdc_obd) {
+                mdc_obd->obd_force = obd->obd_force;
+                mdc_obd->obd_fail = obd->obd_fail;
                 mdc_obd->obd_no_recov = obd->obd_no_recov;
+        }
 
 #ifdef __KERNEL__
         lmv_proc_dir = lprocfs_srch(obd->obd_proc_entry, "target_obds");
@@ -627,7 +653,7 @@ static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
         if (rc)
                 CERROR("Can't finanize fids factory\n");
 
-        CDEBUG(D_OTHER, "Disconnected from %s(%s) successfully\n",
+        CDEBUG(D_INFO, "Disconnected from %s(%s) successfully\n",
                tgt->ltd_exp->exp_obd->obd_name,
                tgt->ltd_exp->exp_obd->obd_uuid.uuid);
 
@@ -647,18 +673,21 @@ static int lmv_disconnect_mdc(struct obd_device *obd, struct lmv_tgt_desc *tgt)
 
 static int lmv_disconnect(struct obd_export *exp)
 {
-        struct obd_device *obd = class_exp2obd(exp);
+        struct obd_device     *obd = class_exp2obd(exp);
 #ifdef __KERNEL__
         struct proc_dir_entry *lmv_proc_dir;
 #endif
-        struct lmv_obd *lmv = &obd->u.lmv;
-        int rc, i;
+        struct lmv_obd        *lmv = &obd->u.lmv;
+        int                    rc;
+        int                    i;
         ENTRY;
 
         if (!lmv->tgts)
                 goto out_local;
 
-        /* Only disconnect the underlying layers on the final disconnect. */
+        /*
+         * Only disconnect the underlying layers on the final disconnect.
+         */
         lmv->refcount--;
         if (lmv->refcount != 0)
                 goto out_local;
@@ -695,12 +724,15 @@ out_local:
 static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
                          int len, void *karg, void *uarg)
 {
-        struct obd_device *obddev = class_exp2obd(exp);
-        struct lmv_obd *lmv = &obddev->u.lmv;
-        int i, rc = 0, set = 0;
+        struct obd_device    *obddev = class_exp2obd(exp);
+        struct lmv_obd       *lmv = &obddev->u.lmv;
+        int                   i = 0;
+        int                   rc = 0;
+        int                   set = 0;
+        int                   count = lmv->desc.ld_tgt_count;
         ENTRY;
 
-        if (lmv->desc.ld_tgt_count == 0)
+        if (count == 0)
                 RETURN(-ENOTTY);
 
         switch (cmd) {
@@ -711,9 +743,7 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
                 __u32 index;
 
                 memcpy(&index, data->ioc_inlbuf2, sizeof(__u32));
-                LASSERT(data->ioc_plen1 == sizeof(struct obd_statfs));
-
-                if ((index >= lmv->desc.ld_tgt_count))
+                if ((index >= count))
                         RETURN(-ENODEV);
 
                 if (!lmv->tgts[index].ltd_active)
@@ -723,28 +753,101 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
                 if (!mdc_obd)
                         RETURN(-EINVAL);
 
-                /* got statfs data */
+                /* copy UUID */
+                if (cfs_copy_to_user(data->ioc_pbuf2, obd2cli_tgt(mdc_obd),
+                                     min((int) data->ioc_plen2,
+                                         (int) sizeof(struct obd_uuid))))
+                        RETURN(-EFAULT);
+
                 rc = obd_statfs(mdc_obd, &stat_buf,
-                                cfs_time_current_64() - HZ, 0);
+                                cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
+                                0);
                 if (rc)
                         RETURN(rc);
-                if (copy_to_user(data->ioc_pbuf1, &stat_buf, data->ioc_plen1))
-                        RETURN(rc);
-                /* copy UUID */
-                rc = copy_to_user(data->ioc_pbuf2, obd2cli_tgt(mdc_obd),
-                                  data->ioc_plen2);
+                if (cfs_copy_to_user(data->ioc_pbuf1, &stat_buf,
+                                     min((int) data->ioc_plen1,
+                                         (int) sizeof(stat_buf))))
+                        RETURN(-EFAULT);
+                break;
+        }
+        case OBD_IOC_QUOTACTL: {
+                struct if_quotactl *qctl = karg;
+                struct lmv_tgt_desc *tgt = NULL;
+                struct obd_quotactl *oqctl;
+
+                if (qctl->qc_valid == QC_MDTIDX) {
+                        if (qctl->qc_idx < 0 || count <= qctl->qc_idx)
+                                RETURN(-EINVAL);
+
+                        tgt = &lmv->tgts[qctl->qc_idx];
+                        if (!tgt->ltd_exp)
+                                RETURN(-EINVAL);
+                } else if (qctl->qc_valid == QC_UUID) {
+                        for (i = 0; i < count; i++) {
+                                tgt = &lmv->tgts[i];
+                                if (!obd_uuid_equals(&tgt->ltd_uuid,
+                                                     &qctl->obd_uuid))
+                                        continue;
+
+                                if (tgt->ltd_exp == NULL)
+                                        RETURN(-EINVAL);
+
+                                break;
+                        }
+                } else {
+                        RETURN(-EINVAL);
+                }
+
+                if (i >= count)
+                        RETURN(-EAGAIN);
+
+                LASSERT(tgt && tgt->ltd_exp);
+                OBD_ALLOC_PTR(oqctl);
+                if (!oqctl)
+                        RETURN(-ENOMEM);
+
+                QCTL_COPY(oqctl, qctl);
+                rc = obd_quotactl(tgt->ltd_exp, oqctl);
+                if (rc == 0) {
+                        QCTL_COPY(qctl, oqctl);
+                        qctl->qc_valid = QC_MDTIDX;
+                        qctl->obd_uuid = tgt->ltd_uuid;
+                }
+                OBD_FREE_PTR(oqctl);
+                break;
+        }
+        case OBD_IOC_CHANGELOG_SEND:
+        case OBD_IOC_CHANGELOG_CLEAR: {
+                struct ioc_changelog *icc = karg;
+
+                if (icc->icc_mdtindex >= count)
+                        RETURN(-ENODEV);
+
+                rc = obd_iocontrol(cmd, lmv->tgts[icc->icc_mdtindex].ltd_exp,
+                                   sizeof(*icc), icc, NULL);
                 break;
         }
+        case LL_IOC_GET_CONNECT_FLAGS: {
+                rc = obd_iocontrol(cmd, lmv->tgts[0].ltd_exp, len, karg, uarg);
+                break;
+        }
+
         default : {
-                for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
+                for (i = 0; i < count; i++) {
                         int err;
+                        struct obd_device *mdc_obd;
 
                         if (lmv->tgts[i].ltd_exp == NULL)
                                 continue;
-
+                        /* ll_umount_begin() sets force flag but for lmv, not
+                         * mdc. Let's pass it through */
+                        mdc_obd = class_exp2obd(lmv->tgts[i].ltd_exp);
+                        mdc_obd->obd_force = obddev->obd_force;
                         err = obd_iocontrol(cmd, lmv->tgts[i].ltd_exp, len,
                                             karg, uarg);
-                        if (err) {
+                        if (err == -ENODATA && cmd == OBD_IOC_POLL_QUOTACHECK) {
+                                RETURN(err);
+                        } else if (err) {
                                 if (lmv->tgts[i].ltd_active) {
                                         CERROR("error: iocontrol MDC %s on MDT"
                                                "idx %d cmd %x: err = %d\n",
@@ -763,11 +866,6 @@ static int lmv_iocontrol(unsigned int cmd, struct obd_export *exp,
         RETURN(rc);
 }
 
-enum MDS_POLICY {
-     CHAR_TYPE,
-     NID_TYPE
-};
-
 static int lmv_all_chars_policy(int count, const char *name,
                                 int len)
 {
@@ -781,51 +879,60 @@ static int lmv_all_chars_policy(int count, const char *name,
 
 static int lmv_nid_policy(struct lmv_obd *lmv)
 {
-        struct obd_import *imp = class_exp2cliimp(lmv->tgts[0].ltd_exp);
-        __u32 id;
+        struct obd_import *imp;
+        __u32              id;
+
         /*
-         * XXX Hack: to get nid we assume that underlying obd device is mdc.
+         * XXX: To get nid we assume that underlying obd device is mdc.
          */
+        imp = class_exp2cliimp(lmv->tgts[0].ltd_exp);
         id = imp->imp_connection->c_self ^ (imp->imp_connection->c_self >> 32);
         return id % lmv->desc.ld_tgt_count;
 }
 
 static int lmv_choose_mds(struct lmv_obd *lmv, struct md_op_data *op_data,
-                          int type)
+                          placement_policy_t placement)
 {
-        switch (type) {
-        case CHAR_TYPE:
+        switch (placement) {
+        case PLACEMENT_CHAR_POLICY:
                 return lmv_all_chars_policy(lmv->desc.ld_tgt_count,
                                             op_data->op_name,
                                             op_data->op_namelen);
-        case NID_TYPE:
+        case PLACEMENT_NID_POLICY:
                 return lmv_nid_policy(lmv);
 
         default:
                 break;
         }
 
-        CERROR("unsupport type %d \n", type);
+        CERROR("Unsupported placement policy %x\n", placement);
         return -EINVAL;
 }
 
-/* This is _inode_ placement policy function (not name). */
+/**
+ * This is _inode_ placement policy function (not name).
+ */
 static int lmv_placement_policy(struct obd_device *obd,
                                 struct md_op_data *op_data,
                                 mdsno_t *mds)
 {
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct lmv_obj *obj;
-        int rc;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_object       *obj;
+        int                      rc;
         ENTRY;
 
         LASSERT(mds != NULL);
 
+        if (lmv->desc.ld_tgt_count == 1) {
+                *mds = 0;
+                RETURN(0);
+        }
+
         /*
          * Allocate new fid on target according to operation type and parent
          * home mds.
          */
-        obj = lmv_obj_grab(obd, &op_data->op_fid1);
+        obj = lmv_object_find(obd, &op_data->op_fid1);
         if (obj != NULL || op_data->op_name == NULL ||
             op_data->op_opc != LUSTRE_OPC_MKDIR) {
                 /*
@@ -833,7 +940,7 @@ static int lmv_placement_policy(struct obd_device *obd,
                  * dir is split.
                  */
                 if (obj) {
-                        lmv_obj_put(obj);
+                        lmv_object_put(obj);
 
                         /*
                          * If we have this flag turned on, and we see that
@@ -853,71 +960,65 @@ static int lmv_placement_policy(struct obd_device *obd,
                  */
                 *mds = op_data->op_mds;
                 rc = 0;
-
-#if 0
-                /* XXX: This should be removed later wehn we sure it is not
-                 * needed. */
-                rc = lmv_fld_lookup(lmv, &op_data->op_fid1, mds);
-                if (rc)
-                        GOTO(out, rc);
-#endif
         } else {
                 /*
                  * Parent directory is not split and we want to create a
                  * directory in it. Let's calculate where to place it according
-                 * to name.
+                 * to operation data @op_data.
                  */
-                *mds = lmv_choose_mds(lmv, op_data, NID_TYPE);
+                *mds = lmv_choose_mds(lmv, op_data, lmv->lmv_placement);
                 rc = 0;
         }
-        EXIT;
-#if 0
-out:
-#endif
+
         if (rc) {
                 CERROR("Can't choose MDS, err = %d\n", rc);
         } else {
                 LASSERT(*mds < lmv->desc.ld_tgt_count);
         }
 
-        return rc;
+        RETURN(rc);
 }
 
 int __lmv_fid_alloc(struct lmv_obd *lmv, struct lu_fid *fid,
                     mdsno_t mds)
 {
-        struct lmv_tgt_desc *tgt = &lmv->tgts[mds];
-        int rc;
+        struct lmv_tgt_desc *tgt;
+        int                  rc;
         ENTRY;
 
-        /* New seq alloc and FLD setup should be atomic. */
-        down(&tgt->ltd_fid_sem);
+        tgt = lmv_get_target(lmv, mds);
+
+        /*
+         * New seq alloc and FLD setup should be atomic. Otherwise we may find
+         * on server that seq in new allocated fid is not yet known.
+         */
+        cfs_down(&tgt->ltd_fid_sem);
+
+        if (!tgt->ltd_active)
+                GOTO(out, rc = -ENODEV);
 
-        /* Asking underlaying tgt layer to allocate new fid. */
+        /*
+         * Asking underlaying tgt layer to allocate new fid.
+         */
         rc = obd_fid_alloc(tgt->ltd_exp, fid, NULL);
         if (rc > 0) {
                 LASSERT(fid_is_sane(fid));
-
-                /* Client switches to new sequence, setup FLD. */
-                rc = fld_client_create(&lmv->lmv_fld, fid_seq(fid),
-                                       mds, NULL);
-                if (rc) {
-                        CERROR("Can't create fld entry, rc %d\n", rc);
-                        /* Delete just allocated fid sequence */
-                        obd_fid_delete(tgt->ltd_exp, NULL);
-                }
+                rc = 0;
         }
-        up(&tgt->ltd_fid_sem);
-        RETURN(rc);
+
+        EXIT;
+out:
+        cfs_up(&tgt->ltd_fid_sem);
+        return rc;
 }
 
 int lmv_fid_alloc(struct obd_export *exp, struct lu_fid *fid,
                   struct md_op_data *op_data)
 {
-        struct obd_device *obd = class_exp2obd(exp);
-        struct lmv_obd *lmv = &obd->u.lmv;
-        mdsno_t mds;
-        int rc;
+        struct obd_device     *obd = class_exp2obd(exp);
+        struct lmv_obd        *lmv = &obd->u.lmv;
+        mdsno_t                mds;
+        int                    rc;
         ENTRY;
 
         LASSERT(op_data != NULL);
@@ -942,10 +1043,9 @@ int lmv_fid_alloc(struct obd_export *exp, struct lu_fid *fid,
 static int lmv_fid_delete(struct obd_export *exp, const struct lu_fid *fid)
 {
         ENTRY;
-
-        LASSERT(exp && fid);
-        if (lmv_obj_delete(exp, fid)) {
-                CDEBUG(D_OTHER, "lmv object "DFID" is destroyed.\n",
+        LASSERT(exp != NULL && fid != NULL);
+        if (lmv_object_delete(exp, fid)) {
+                CDEBUG(D_INODE, "Object "DFID" is destroyed.\n",
                        PFID(fid));
         }
         RETURN(0);
@@ -953,10 +1053,11 @@ static int lmv_fid_delete(struct obd_export *exp, const struct lu_fid *fid)
 
 static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct lprocfs_static_vars lvars;
-        struct lmv_desc *desc;
-        int rc, i = 0;
+        struct lmv_obd             *lmv = &obd->u.lmv;
+        struct lprocfs_static_vars  lvars;
+        struct lmv_desc            *desc;
+        int                         rc;
+        int                         i = 0;
         ENTRY;
 
         if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1) {
@@ -966,7 +1067,7 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 
         desc = (struct lmv_desc *)lustre_cfg_buf(lcfg, 1);
         if (sizeof(*desc) > LUSTRE_CFG_BUFLEN(lcfg, 1)) {
-                CERROR("descriptor size wrong: %d > %d\n",
+                CERROR("Lmv descriptor size wrong: %d > %d\n",
                        (int)sizeof(*desc), LUSTRE_CFG_BUFLEN(lcfg, 1));
                 RETURN(-EINVAL);
         }
@@ -978,7 +1079,7 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
                 RETURN(-ENOMEM);
 
         for (i = 0; i < LMV_MAX_TGT_COUNT; i++) {
-                sema_init(&lmv->tgts[i].ltd_fid_sem, 1);
+                cfs_sema_init(&lmv->tgts[i].ltd_fid_sem, 1);
                 lmv->tgts[i].ltd_idx = i;
         }
 
@@ -994,14 +1095,14 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
         lmv->max_cookiesize = 0;
         lmv->max_def_easize = 0;
         lmv->max_easize = 0;
+        lmv->lmv_placement = PLACEMENT_CHAR_POLICY;
 
-        spin_lock_init(&lmv->lmv_lock);
-        sema_init(&lmv->init_sem, 1);
+        cfs_spin_lock_init(&lmv->lmv_lock);
+        cfs_sema_init(&lmv->init_sem, 1);
 
-        rc = lmv_obj_setup(obd);
+        rc = lmv_object_setup(obd);
         if (rc) {
-                CERROR("Can't setup LMV object manager, "
-                       "error %d.\n", rc);
+                CERROR("Can't setup LMV object manager, error %d.\n", rc);
                 GOTO(out_free_datas, rc);
         }
 
@@ -1009,17 +1110,17 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
         lprocfs_obd_setup(obd, lvars.obd_vars);
 #ifdef LPROCFS
         {
-                rc = lprocfs_seq_create(obd->obd_proc_entry, "target_obd_status",
+                rc = lprocfs_seq_create(obd->obd_proc_entry, "target_obd",
                                         0444, &lmv_proc_target_fops, obd);
                 if (rc)
-                        CWARN("Error adding the target_obd_status file\n");
+                        CWARN("%s: error adding LMV target_obd file: rc = %d\n",
+                               obd->obd_name, rc);
        }
 #endif
         rc = fld_client_init(&lmv->lmv_fld, obd->obd_name,
                              LUSTRE_CLI_FLD_HASH_DHT);
         if (rc) {
-                CERROR("can't init FLD, err %d\n",
-                       rc);
+                CERROR("Can't init FLD, err %d\n", rc);
                 GOTO(out_free_datas, rc);
         }
 
@@ -1036,12 +1137,11 @@ out_free_tgts:
 
 static int lmv_cleanup(struct obd_device *obd)
 {
-        struct lmv_obd *lmv = &obd->u.lmv;
+        struct lmv_obd   *lmv = &obd->u.lmv;
         ENTRY;
 
         fld_client_fini(&lmv->lmv_fld);
-        lprocfs_obd_cleanup(obd);
-        lmv_obj_cleanup(obd);
+        lmv_object_cleanup(obd);
         OBD_FREE(lmv->datas, lmv->datas_size);
         OBD_FREE(lmv->tgts, lmv->tgts_size);
 
@@ -1050,9 +1150,9 @@ static int lmv_cleanup(struct obd_device *obd)
 
 static int lmv_process_config(struct obd_device *obd, obd_count len, void *buf)
 {
-        struct lustre_cfg *lcfg = buf;
-        struct obd_uuid tgt_uuid;
-        int rc;
+        struct lustre_cfg     *lcfg = buf;
+        struct obd_uuid        tgt_uuid;
+        int                    rc;
         ENTRY;
 
         switch(lcfg->lcfg_command) {
@@ -1075,9 +1175,10 @@ out:
 static int lmv_statfs(struct obd_device *obd, struct obd_statfs *osfs,
                       __u64 max_age, __u32 flags)
 {
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_statfs *temp;
-        int rc = 0, i;
+        struct lmv_obd        *lmv = &obd->u.lmv;
+        struct obd_statfs     *temp;
+        int                    rc = 0;
+        int                    i;
         ENTRY;
 
         rc = lmv_check_connect(obd);
@@ -1120,9 +1221,9 @@ static int lmv_getstatus(struct obd_export *exp,
                          struct lu_fid *fid,
                          struct obd_capa **pc)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        int rc;
+        struct obd_device    *obd = exp->exp_obd;
+        struct lmv_obd       *lmv = &obd->u.lmv;
+        int                   rc;
         ENTRY;
 
         rc = lmv_check_connect(obd);
@@ -1130,7 +1231,6 @@ static int lmv_getstatus(struct obd_export *exp,
                 RETURN(rc);
 
         rc = md_getstatus(lmv->tgts[0].ltd_exp, fid, pc);
-
         RETURN(rc);
 }
 
@@ -1139,22 +1239,22 @@ static int lmv_getxattr(struct obd_export *exp, const struct lu_fid *fid,
                         const char *input, int input_size, int output_size,
                         int flags, struct ptlrpc_request **request)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        int rc;
+        struct obd_device      *obd = exp->exp_obd;
+        struct lmv_obd         *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc    *tgt;
+        int                     rc;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        tgt_exp = lmv_find_export(lmv, fid);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        tgt = lmv_find_target(lmv, fid);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
 
-        rc = md_getxattr(tgt_exp, fid, oc, valid, name, input, input_size,
-                         output_size, flags, request);
+        rc = md_getxattr(tgt->ltd_exp, fid, oc, valid, name, input,
+                         input_size, output_size, flags, request);
 
         RETURN(rc);
 }
@@ -1165,53 +1265,58 @@ static int lmv_setxattr(struct obd_export *exp, const struct lu_fid *fid,
                         int flags, __u32 suppgid,
                         struct ptlrpc_request **request)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        int rc;
+        struct obd_device      *obd = exp->exp_obd;
+        struct lmv_obd         *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc    *tgt;
+        int                     rc;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        tgt_exp = lmv_find_export(lmv, fid);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        tgt = lmv_find_target(lmv, fid);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
 
-        rc = md_setxattr(tgt_exp, fid, oc, valid, name,
-                         input, input_size, output_size, flags, suppgid,
+        rc = md_setxattr(tgt->ltd_exp, fid, oc, valid, name, input,
+                         input_size, output_size, flags, suppgid,
                          request);
 
         RETURN(rc);
 }
 
-static int lmv_getattr(struct obd_export *exp, const struct lu_fid *fid,
-                       struct obd_capa *oc, obd_valid valid, int ea_size,
+static int lmv_getattr(struct obd_export *exp, struct md_op_data *op_data,
                        struct ptlrpc_request **request)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        struct lmv_obj *obj;
-        int rc, i;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc     *tgt;
+        struct lmv_object       *obj;
+        int                      rc;
+        int                      i;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        tgt_exp = lmv_find_export(lmv, fid);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        tgt = lmv_find_target(lmv, &op_data->op_fid1);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
+
+        if (op_data->op_valid & OBD_MD_MDTIDX) {
+                op_data->op_mds = tgt->ltd_idx;
+                RETURN(0);
+        }
 
-        rc = md_getattr(tgt_exp, fid, oc, valid, ea_size, request);
+        rc = md_getattr(tgt->ltd_exp, op_data, request);
         if (rc)
                 RETURN(rc);
 
-        obj = lmv_obj_grab(obd, fid);
+        obj = lmv_object_find_lock(obd, &op_data->op_fid1);
 
-        CDEBUG(D_OTHER, "GETATTR for "DFID" %s\n", PFID(fid),
+        CDEBUG(D_INODE, "GETATTR for "DFID" %s\n", PFID(&op_data->op_fid1),
                obj ? "(split)" : "");
 
         /*
@@ -1225,7 +1330,7 @@ static int lmv_getattr(struct obd_export *exp, const struct lu_fid *fid,
                 struct mdt_body *body;
 
                 if (*request == NULL) {
-                        lmv_obj_put(obj);
+                        lmv_object_put(obj);
                         RETURN(rc);
                 }
 
@@ -1233,8 +1338,6 @@ static int lmv_getattr(struct obd_export *exp, const struct lu_fid *fid,
                                               &RMF_MDT_BODY);
                 LASSERT(body != NULL);
 
-                lmv_obj_lock(obj);
-
                 for (i = 0; i < obj->lo_objcount; i++) {
                         if (lmv->tgts[i].ltd_exp == NULL) {
                                 CWARN("%s: NULL export for %d\n",
@@ -1242,15 +1345,16 @@ static int lmv_getattr(struct obd_export *exp, const struct lu_fid *fid,
                                 continue;
                         }
 
-                        /* skip master obj. */
-                        if (lu_fid_eq(&obj->lo_fid, &obj->lo_inodes[i].li_fid))
+                        /*
+                         * Skip master object.
+                         */
+                        if (lu_fid_eq(&obj->lo_fid, &obj->lo_stripes[i].ls_fid))
                                 continue;
 
-                        lmv_update_body(body, &obj->lo_inodes[i]);
+                        body->size += obj->lo_stripes[i].ls_size;
                 }
 
-                lmv_obj_unlock(obj);
-                lmv_obj_put(obj);
+                lmv_object_put_unlock(obj);
         }
 
         RETURN(rc);
@@ -1259,16 +1363,17 @@ static int lmv_getattr(struct obd_export *exp, const struct lu_fid *fid,
 static int lmv_change_cbdata(struct obd_export *exp, const struct lu_fid *fid,
                              ldlm_iterator_t it, void *data)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        int i, rc;
+        struct obd_device   *obd = exp->exp_obd;
+        struct lmv_obd      *lmv = &obd->u.lmv;
+        int                  i;
+        int                  rc;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        CDEBUG(D_OTHER, "CBDATA for "DFID"\n", PFID(fid));
+        CDEBUG(D_INODE, "CBDATA for "DFID"\n", PFID(fid));
 
         /*
          * With CMD every object can have two locks in different namespaces:
@@ -1281,44 +1386,74 @@ static int lmv_change_cbdata(struct obd_export *exp, const struct lu_fid *fid,
         RETURN(0);
 }
 
-static int lmv_close(struct obd_export *exp,
-                     struct md_op_data *op_data,
-                     struct md_open_data *mod,
-                     struct ptlrpc_request **request)
+static int lmv_find_cbdata(struct obd_export *exp, const struct lu_fid *fid,
+                           ldlm_iterator_t it, void *data)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        int rc;
+        struct obd_device   *obd = exp->exp_obd;
+        struct lmv_obd      *lmv = &obd->u.lmv;
+        int                  i;
+        int                  rc;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        tgt_exp = lmv_find_export(lmv, &op_data->op_fid1);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        CDEBUG(D_INODE, "CBDATA for "DFID"\n", PFID(fid));
+
+        /*
+         * With CMD every object can have two locks in different namespaces:
+         * lookup lock in space of mds storing direntry and update/open lock in
+         * space of mds storing inode.
+         */
+        for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
+                rc = md_find_cbdata(lmv->tgts[i].ltd_exp, fid, it, data);
+                if (rc)
+                        RETURN(rc);
+        }
 
-        CDEBUG(D_OTHER, "CLOSE "DFID"\n", PFID(&op_data->op_fid1));
-        rc = md_close(tgt_exp, op_data, mod, request);
         RETURN(rc);
 }
 
-/*
+
+static int lmv_close(struct obd_export *exp, struct md_op_data *op_data,
+                     struct md_open_data *mod, struct ptlrpc_request **request)
+{
+        struct obd_device     *obd = exp->exp_obd;
+        struct lmv_obd        *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc   *tgt;
+        int                    rc;
+        ENTRY;
+
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
+
+        tgt = lmv_find_target(lmv, &op_data->op_fid1);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
+
+        CDEBUG(D_INODE, "CLOSE "DFID"\n", PFID(&op_data->op_fid1));
+        rc = md_close(tgt->ltd_exp, op_data, mod, request);
+        RETURN(rc);
+}
+
+/**
  * Called in the case MDS returns -ERESTART on create on open, what means that
  * directory is split and its LMV presentation object has to be updated.
  */
 int lmv_handle_split(struct obd_export *exp, const struct lu_fid *fid)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct ptlrpc_request *req = NULL;
-        struct obd_export *tgt_exp;
-        struct lmv_obj *obj;
-        struct lustre_md md;
-        int mealen, rc;
-        __u64 valid;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct ptlrpc_request   *req = NULL;
+        struct lmv_tgt_desc     *tgt;
+        struct lmv_object       *obj;
+        struct lustre_md         md;
+        struct md_op_data       *op_data;
+        int                      mealen;
+        int                      rc;
+        __u64                    valid;
         ENTRY;
 
         md.mea = NULL;
@@ -1326,34 +1461,45 @@ int lmv_handle_split(struct obd_export *exp, const struct lu_fid *fid)
 
         valid = OBD_MD_FLEASIZE | OBD_MD_FLDIREA | OBD_MD_MEA;
 
-        tgt_exp = lmv_find_export(lmv, fid);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        tgt = lmv_find_target(lmv, fid);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
+
+        /*
+         * Time to update mea of parent fid.
+         */
+
+        OBD_ALLOC_PTR(op_data);
+        if (op_data == NULL) 
+                RETURN(-ENOMEM);
+
+        op_data->op_fid1 = *fid;
+        op_data->op_mode = mealen;
+        op_data->op_valid = valid;
 
-        /* time to update mea of parent fid */
-        rc = md_getattr(tgt_exp, fid, NULL, valid, mealen, &req);
+        rc = md_getattr(tgt->ltd_exp, op_data, &req);
+        OBD_FREE_PTR(op_data);
         if (rc) {
                 CERROR("md_getattr() failed, error %d\n", rc);
                 GOTO(cleanup, rc);
         }
 
-        rc = md_get_lustre_md(tgt_exp, req, NULL, exp, &md);
+        rc = md_get_lustre_md(tgt->ltd_exp, req, NULL, exp, &md);
         if (rc) {
-                CERROR("mdc_get_lustre_md() failed, error %d\n", rc);
+                CERROR("md_get_lustre_md() failed, error %d\n", rc);
                 GOTO(cleanup, rc);
         }
 
         if (md.mea == NULL)
                 GOTO(cleanup, rc = -ENODATA);
 
-        obj = lmv_obj_create(exp, fid, md.mea);
+        obj = lmv_object_create(exp, fid, md.mea);
         if (IS_ERR(obj))
                 rc = PTR_ERR(obj);
         else
-                lmv_obj_put(obj);
-
-        obd_free_memmd(exp, (struct lov_stripe_md **)&md.mea);
+                lmv_object_put(obj);
 
+        obd_free_memmd(exp, (void *)&md.mea);
         EXIT;
 cleanup:
         if (req)
@@ -1363,14 +1509,16 @@ cleanup:
 
 int lmv_create(struct obd_export *exp, struct md_op_data *op_data,
                const void *data, int datalen, int mode, __u32 uid,
-               __u32 gid, __u32 cap_effective,  __u64 rdev,
+               __u32 gid, cfs_cap_t cap_effective, __u64 rdev,
                struct ptlrpc_request **request)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        struct lmv_obj *obj;
-        int rc, loop = 0;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc     *tgt;
+        struct lmv_object       *obj;
+        int                      rc;
+        int                      loop = 0;
+        int                      sidx;
         ENTRY;
 
         rc = lmv_check_connect(obd);
@@ -1382,28 +1530,24 @@ int lmv_create(struct obd_export *exp, struct md_op_data *op_data,
 repeat:
         ++loop;
         LASSERT(loop <= 2);
-        obj = lmv_obj_grab(obd, &op_data->op_fid1);
-        if (obj) {
-                int mea_idx;
 
-                mea_idx = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
+        obj = lmv_object_find(obd, &op_data->op_fid1);
+        if (obj) {
+                sidx = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
                                        op_data->op_name, op_data->op_namelen);
-                op_data->op_fid1 = obj->lo_inodes[mea_idx].li_fid;
+                op_data->op_fid1 = obj->lo_stripes[sidx].ls_fid;
                 op_data->op_bias &= ~MDS_CHECK_SPLIT;
-                op_data->op_mds = obj->lo_inodes[mea_idx].li_mds;
-                tgt_exp = lmv_get_export(lmv, op_data->op_mds);
-                lmv_obj_put(obj);
+                op_data->op_mds = obj->lo_stripes[sidx].ls_mds;
+                tgt = lmv_get_target(lmv, op_data->op_mds);
+                lmv_object_put(obj);
         } else {
-                struct lmv_tgt_desc *tgt;
-
                 tgt = lmv_find_target(lmv, &op_data->op_fid1);
                 op_data->op_bias |= MDS_CHECK_SPLIT;
                 op_data->op_mds = tgt->ltd_idx;
-                tgt_exp = tgt->ltd_exp;
         }
 
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
 
         rc = lmv_fid_alloc(exp, &op_data->op_fid2, op_data);
         if (rc == -ERESTART)
@@ -1411,16 +1555,17 @@ repeat:
         else if (rc)
                 RETURN(rc);
 
-        CDEBUG(D_OTHER, "CREATE '%*s' on "DFID"\n", op_data->op_namelen,
-               op_data->op_name, PFID(&op_data->op_fid1));
+        CDEBUG(D_INODE, "CREATE '%*s' on "DFID" -> mds #%x\n",
+               op_data->op_namelen, op_data->op_name, PFID(&op_data->op_fid1),
+               op_data->op_mds);
 
         op_data->op_flags |= MF_MDC_CANCEL_FID1;
-        rc = md_create(tgt_exp, op_data, data, datalen, mode, uid, gid,
+        rc = md_create(tgt->ltd_exp, op_data, data, datalen, mode, uid, gid,
                        cap_effective, rdev, request);
         if (rc == 0) {
                 if (*request == NULL)
                         RETURN(rc);
-                CDEBUG(D_OTHER, "created - "DFID"\n", PFID(&op_data->op_fid1));
+                CDEBUG(D_INODE, "Created - "DFID"\n", PFID(&op_data->op_fid2));
         } else if (rc == -ERESTART) {
                 LASSERT(*request != NULL);
                 DEBUG_REQ(D_WARNING|D_RPCTRACE, *request,
@@ -1434,8 +1579,8 @@ repeat:
                  */
                 rc = lmv_handle_split(exp, &op_data->op_fid1);
                 if (rc == 0) {
-                        rc = lmv_alloc_slave_fids(obd, &op_data->op_fid1,
-                                                  op_data, &op_data->op_fid2);
+                        rc = lmv_allocate_slaves(obd, &op_data->op_fid1,
+                                                 op_data, &op_data->op_fid2);
                         if (rc)
                                 RETURN(rc);
                         goto repeat;
@@ -1448,21 +1593,21 @@ static int lmv_done_writing(struct obd_export *exp,
                             struct md_op_data *op_data,
                             struct md_open_data *mod)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        int rc;
+        struct obd_device     *obd = exp->exp_obd;
+        struct lmv_obd        *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc   *tgt;
+        int                    rc;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        tgt_exp = lmv_find_export(lmv, &op_data->op_fid1);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        tgt = lmv_find_target(lmv, &op_data->op_fid1);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
 
-        rc = md_done_writing(tgt_exp, op_data, mod);
+        rc = md_done_writing(tgt->ltd_exp, op_data, mod);
         RETURN(rc);
 }
 
@@ -1471,12 +1616,13 @@ lmv_enqueue_slaves(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 obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct lmv_stripe_md *mea = op_data->op_mea1;
-        struct md_op_data *op_data2;
-        struct obd_export *tgt_exp;
-        int i, rc = 0;
+        struct obd_device     *obd = exp->exp_obd;
+        struct lmv_obd        *lmv = &obd->u.lmv;
+        struct lmv_stripe_md  *mea = op_data->op_mea1;
+        struct md_op_data     *op_data2;
+        struct lmv_tgt_desc   *tgt;
+        int                    i;
+        int                    rc = 0;
         ENTRY;
 
         OBD_ALLOC_PTR(op_data2);
@@ -1489,17 +1635,17 @@ lmv_enqueue_slaves(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
                 op_data2->op_fid1 = mea->mea_ids[i];
                 op_data2->op_bias = 0;
 
-                tgt_exp = lmv_find_export(lmv, &op_data2->op_fid1);
-                if (IS_ERR(tgt_exp))
-                        GOTO(cleanup, rc = PTR_ERR(tgt_exp));
+                tgt = lmv_find_target(lmv, &op_data2->op_fid1);
+                if (IS_ERR(tgt))
+                        GOTO(cleanup, rc = PTR_ERR(tgt));
 
-                if (tgt_exp == NULL)
+                if (tgt->ltd_exp == NULL)
                         continue;
 
-                rc = md_enqueue(tgt_exp, einfo, it, op_data2,
-                                lockh + i, lmm, lmmsize, 0);
+                rc = md_enqueue(tgt->ltd_exp, einfo, it, op_data2,
+                                lockh + i, lmm, lmmsize, NULL, 0);
 
-                CDEBUG(D_OTHER, "take lock on slave "DFID" -> %d/%d\n",
+                CDEBUG(D_INODE, "Take lock on slave "DFID" -> %d/%d\n",
                        PFID(&mea->mea_ids[i]), rc, it->d.lustre.it_status);
 
                 if (rc)
@@ -1520,7 +1666,9 @@ cleanup:
         OBD_FREE_PTR(op_data2);
 
         if (rc != 0) {
-                /* drop all taken locks */
+                /*
+                 * Drop all taken locks.
+                 */
                 while (--i >= 0) {
                         if (lockh[i].cookie)
                                 ldlm_lock_decref(lockh + i, einfo->ei_mode);
@@ -1536,15 +1684,16 @@ lmv_enqueue_remote(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
                    struct lustre_handle *lockh, void *lmm, int lmmsize,
                    int extra_lock_flags)
 {
-        struct ptlrpc_request *req = it->d.lustre.it_data;
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct lustre_handle plock;
-        struct obd_export *tgt_exp;
-        struct md_op_data *rdata;
-        struct lu_fid fid_copy;
-        struct mdt_body *body;
-        int rc = 0, pmode;
+        struct ptlrpc_request      *req = it->d.lustre.it_data;
+        struct obd_device          *obd = exp->exp_obd;
+        struct lmv_obd             *lmv = &obd->u.lmv;
+        struct lustre_handle        plock;
+        struct lmv_tgt_desc        *tgt;
+        struct md_op_data          *rdata;
+        struct lu_fid               fid1;
+        struct mdt_body            *body;
+        int                         rc = 0;
+        int                         pmode;
         ENTRY;
 
         body = req_capsule_server_get(&req->rq_pill, &RMF_MDT_BODY);
@@ -1553,33 +1702,35 @@ lmv_enqueue_remote(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
         if (!(body->valid & OBD_MD_MDS))
                 RETURN(0);
 
-        CDEBUG(D_OTHER, "ENQUEUE '%s' on "DFID" -> "DFID"\n",
+        CDEBUG(D_INODE, "REMOTE_ENQUEUE '%s' on "DFID" -> "DFID"\n",
                LL_IT2STR(it), PFID(&op_data->op_fid1), PFID(&body->fid1));
 
-        /* We got LOOKUP lock, but we really need attrs */
+        /*
+         * We got LOOKUP lock, but we really need attrs.
+         */
         pmode = it->d.lustre.it_lock_mode;
         LASSERT(pmode != 0);
         memcpy(&plock, lockh, sizeof(plock));
         it->d.lustre.it_lock_mode = 0;
         it->d.lustre.it_data = NULL;
-        fid_copy = body->fid1;
+        fid1 = body->fid1;
 
         it->d.lustre.it_disposition &= ~DISP_ENQ_COMPLETE;
         ptlrpc_req_finished(req);
 
-        tgt_exp = lmv_find_export(lmv, &fid_copy);
-        if (IS_ERR(tgt_exp))
-                GOTO(out, rc = PTR_ERR(tgt_exp));
+        tgt = lmv_find_target(lmv, &fid1);
+        if (IS_ERR(tgt))
+                GOTO(out, rc = PTR_ERR(tgt));
 
         OBD_ALLOC_PTR(rdata);
         if (rdata == NULL)
                 GOTO(out, rc = -ENOMEM);
 
-        rdata->op_fid1 = fid_copy;
+        rdata->op_fid1 = fid1;
         rdata->op_bias = MDS_CROSS_REF;
 
-        rc = md_enqueue(tgt_exp, einfo, it, rdata, lockh,
-                        lmm, lmmsize, extra_lock_flags);
+        rc = md_enqueue(tgt->ltd_exp, einfo, it, rdata, lockh,
+                        lmm, lmmsize, NULL, extra_lock_flags);
         OBD_FREE_PTR(rdata);
         EXIT;
 out:
@@ -1591,72 +1742,74 @@ static int
 lmv_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,
-            int extra_lock_flags)
-{
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp = NULL;
-        struct lmv_obj *obj;
-        int rc;
+            struct ptlrpc_request **req, int extra_lock_flags)
+{
+        struct obd_device        *obd = exp->exp_obd;
+        struct lmv_obd           *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc      *tgt;
+        struct lmv_object        *obj;
+        int                       sidx;
+        int                       rc;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        if (op_data->op_mea1 && it->it_op == IT_UNLINK) {
+        CDEBUG(D_INODE, "ENQUEUE '%s' on "DFID"\n",
+               LL_IT2STR(it), PFID(&op_data->op_fid1));
+
+        if (op_data->op_mea1 && it && it->it_op == IT_UNLINK) {
                 rc = lmv_enqueue_slaves(exp, einfo, it, op_data,
                                         lockh, lmm, lmmsize);
                 RETURN(rc);
         }
 
-        if (op_data->op_namelen) {
-                obj = lmv_obj_grab(obd, &op_data->op_fid1);
-                if (obj) {
-                        int mea_idx;
-
-                        /* directory is split. look for right mds for this
-                         * name */
-                        mea_idx = raw_name2idx(obj->lo_hashtype,
-                                               obj->lo_objcount,
-                                               (char *)op_data->op_name,
-                                               op_data->op_namelen);
-                        op_data->op_fid1 = obj->lo_inodes[mea_idx].li_fid;
-                        tgt_exp = lmv_get_export(lmv, obj->lo_inodes[mea_idx].li_mds);
-                        lmv_obj_put(obj);
-                }
+        obj = lmv_object_find(obd, &op_data->op_fid1);
+        if (obj && op_data->op_namelen) {
+                sidx = raw_name2idx(obj->lo_hashtype,
+                                       obj->lo_objcount,
+                                       (char *)op_data->op_name,
+                                       op_data->op_namelen);
+                op_data->op_fid1 = obj->lo_stripes[sidx].ls_fid;
+                tgt = lmv_get_target(lmv, obj->lo_stripes[sidx].ls_mds);
+        } else {
+                tgt = lmv_find_target(lmv, &op_data->op_fid1);
         }
+        if (obj)
+                lmv_object_put(obj);
 
-        if (tgt_exp == NULL)
-                tgt_exp = lmv_find_export(lmv, &op_data->op_fid1);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
 
-        CDEBUG(D_OTHER, "ENQUEUE '%s' on "DFID"\n", LL_IT2STR(it),
-               PFID(&op_data->op_fid1));
+        CDEBUG(D_INODE, "ENQUEUE '%s' on "DFID" -> mds #%d\n",
+               LL_IT2STR(it), PFID(&op_data->op_fid1), tgt->ltd_idx);
 
-        rc = md_enqueue(tgt_exp, einfo, it, op_data, lockh,
-                        lmm, lmmsize, extra_lock_flags);
+        rc = md_enqueue(tgt->ltd_exp, einfo, it, op_data, lockh,
+                        lmm, lmmsize, req, extra_lock_flags);
 
-        if (rc == 0 && it->it_op == IT_OPEN)
+        if (rc == 0 && it && it->it_op == IT_OPEN) {
                 rc = lmv_enqueue_remote(exp, einfo, it, op_data, lockh,
                                         lmm, lmmsize, extra_lock_flags);
+        }
         RETURN(rc);
 }
 
 static int
-lmv_getattr_name(struct obd_export *exp, const struct lu_fid *fid,
-                 struct obd_capa *oc, const char *filename, int namelen,
-                 obd_valid valid, int ea_size, __u32 suppgid,
+lmv_getattr_name(struct obd_export *exp,struct md_op_data *op_data,
                  struct ptlrpc_request **request)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct lu_fid rid = *fid;
-        struct obd_export *tgt_exp;
-        struct mdt_body *body;
-        struct lmv_obj *obj;
-        int rc, loop = 0;
+        struct ptlrpc_request   *req = NULL;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lu_fid            rid = op_data->op_fid1;
+        struct lmv_tgt_desc     *tgt;
+        struct mdt_body         *body;
+        struct lmv_object       *obj;
+        obd_valid                valid = op_data->op_valid;
+        int                      rc;
+        int                      loop = 0;
+        int                      sidx;
         ENTRY;
 
         rc = lmv_check_connect(obd);
@@ -1666,50 +1819,51 @@ lmv_getattr_name(struct obd_export *exp, const struct lu_fid *fid,
 repeat:
         ++loop;
         LASSERT(loop <= 2);
-        obj = lmv_obj_grab(obd, &rid);
+        obj = lmv_object_find(obd, &rid);
         if (obj) {
-                int mea_idx;
-
-                /* Directory is split. Look for right mds for this name */
-                mea_idx = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
-                                       filename, namelen - 1);
-                rid = obj->lo_inodes[mea_idx].li_fid;
-                tgt_exp = lmv_get_export(lmv, obj->lo_inodes[mea_idx].li_mds);
-                lmv_obj_put(obj);
+                sidx = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
+                                    op_data->op_name, op_data->op_namelen);
+                rid = obj->lo_stripes[sidx].ls_fid;
+                tgt = lmv_get_target(lmv, obj->lo_stripes[sidx].ls_mds);
+                op_data->op_mds = obj->lo_stripes[sidx].ls_mds;
                 valid &= ~OBD_MD_FLCKSPLIT;
+                lmv_object_put(obj);
         } else {
-                tgt_exp = lmv_find_export(lmv, &rid);
+                tgt = lmv_find_target(lmv, &rid);
                 valid |= OBD_MD_FLCKSPLIT;
+                op_data->op_mds = tgt->ltd_idx;
         }
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
 
-        CDEBUG(D_OTHER, "getattr_name for %*s on "DFID" -> "DFID"\n",
-               namelen, filename, PFID(fid), PFID(&rid));
+        CDEBUG(D_INODE, "GETATTR_NAME for %*s on "DFID" - "DFID" -> mds #%d\n",
+               op_data->op_namelen, op_data->op_name, PFID(&op_data->op_fid1),
+               PFID(&rid), tgt->ltd_idx);
 
-        rc = md_getattr_name(tgt_exp, &rid, oc, filename, namelen, valid,
-                             ea_size, suppgid, request);
+        op_data->op_valid = valid;
+        op_data->op_fid1 = rid;
+        rc = md_getattr_name(tgt->ltd_exp, op_data, request);
         if (rc == 0) {
                 body = req_capsule_server_get(&(*request)->rq_pill,
                                               &RMF_MDT_BODY);
                 LASSERT(body != NULL);
 
                 if (body->valid & OBD_MD_MDS) {
-                        struct ptlrpc_request *req = NULL;
-
                         rid = body->fid1;
-                        CDEBUG(D_OTHER, "request attrs for "DFID"\n",
+                        CDEBUG(D_INODE, "Request attrs for "DFID"\n",
                                PFID(&rid));
 
-                        tgt_exp = lmv_find_export(lmv, &rid);
-                        if (IS_ERR(tgt_exp)) {
+                        tgt = lmv_find_target(lmv, &rid);
+                        if (IS_ERR(tgt)) {
                                 ptlrpc_req_finished(*request);
-                                RETURN(PTR_ERR(tgt_exp));
+                                RETURN(PTR_ERR(tgt));
                         }
 
-                        rc = md_getattr_name(tgt_exp, &rid, NULL, NULL, 1,
-                                             valid | OBD_MD_FLCROSSREF,
-                                             ea_size, suppgid, &req);
+                        op_data->op_fid1 = rid;
+                        op_data->op_valid |= OBD_MD_FLCROSSREF;
+                        op_data->op_namelen = 0;
+                        op_data->op_name = NULL;
+                        rc = md_getattr_name(tgt->ltd_exp, op_data, &req);
                         ptlrpc_req_finished(*request);
                         *request = req;
                 }
@@ -1738,90 +1892,100 @@ repeat:
          fl == MF_MDC_CANCEL_FID4 ? &op_data->op_fid4 : \
          NULL)
 
-/* @tgt_exp is the export the metadata request is sent.
- * @fid_exp is the export the cancel should be sent for the current fid.
- * if @fid_exp is NULL, the export is found for the current fid.
- * @op_data keeps the current fid, which is pointed through @flag.
- * @mode, @bits -- lock match parameters. */
-static int lmv_early_cancel(struct lmv_obd *lmv, struct obd_export *tgt_exp,
-                            struct obd_export *fid_exp,
-                            struct md_op_data *op_data,
-                            ldlm_mode_t mode, int bits, int flag)
+static int lmv_early_cancel_slaves(struct obd_export *exp,
+                                   struct md_op_data *op_data, int op_tgt,
+                                   ldlm_mode_t mode, int bits, int flag)
 {
-        struct lu_fid *fid = md_op_data_fid(op_data, flag);
-        ldlm_policy_data_t policy = {{0}};
-        int rc = 0;
+        struct obd_device      *obd = exp->exp_obd;
+        struct lmv_obd         *lmv = &obd->u.lmv;
+        ldlm_policy_data_t      policy = {{0}};
+        struct lu_fid          *op_fid;
+        struct lu_fid          *st_fid;
+        struct lmv_tgt_desc    *tgt;
+        struct lmv_object      *obj;
+        int                     rc = 0;
+        int                     i;
         ENTRY;
 
-        if (!fid_is_sane(fid))
+        op_fid = md_op_data_fid(op_data, flag);
+        if (!fid_is_sane(op_fid))
                 RETURN(0);
 
-        if (fid_exp == NULL)
-                fid_exp = lmv_find_export(lmv, fid);
-
-        if (tgt_exp == fid_exp) {
-                /* The export is the same as on the target server, cancel 
-                 * will be sent along with the main metadata operation. */
-                op_data->op_flags |= flag;
-                RETURN(0);
-        }
+        obj = lmv_object_find(obd, op_fid);
+        if (obj == NULL)
+                RETURN(-EALREADY);
 
         policy.l_inodebits.bits = bits;
-        rc = md_cancel_unused(fid_exp, fid, &policy, mode, LDLM_FL_ASYNC, NULL);
-        RETURN(rc);
-}
-
-#ifdef EARLY_CANCEL_FOR_STRIPED_DIR_IS_READY
-/* Check if the fid in @op_data pointed to by flag is of the same export(s)
- * as @tgt_exp. Early cancels will be sent later by mdc code, otherwise, call
- * md_cancel_unused for child export(s). */
-static int lmv_early_cancel_stripes(struct obd_export *exp,
-                                    struct obd_export *tgt_exp,
-                                    struct md_op_data *op_data,
-                                    ldlm_mode_t mode, int bits, int flag)
+        for (i = 0; i < obj->lo_objcount; i++) {
+                tgt = lmv_get_target(lmv, obj->lo_stripes[i].ls_mds);
+                st_fid = &obj->lo_stripes[i].ls_fid;
+                if (op_tgt != tgt->ltd_idx) {
+                        CDEBUG(D_INODE, "EARLY_CANCEL slave "DFID" -> mds #%d\n",
+                               PFID(st_fid), tgt->ltd_idx);
+                        rc = md_cancel_unused(tgt->ltd_exp, st_fid, &policy,
+                                              mode, LCF_ASYNC, NULL);
+                        if (rc)
+                                GOTO(out_put_obj, rc);
+                } else {
+                        CDEBUG(D_INODE,
+                               "EARLY_CANCEL skip operation target %d on "DFID"\n",
+                               op_tgt, PFID(st_fid));
+                        /*
+                         * Do not cancel locks for operation target, they will
+                         * be handled later in underlaying layer when calling
+                         * function we run on behalf of.
+                         */
+                        *op_fid = *st_fid;
+                        op_data->op_flags |= flag;
+                }
+        }
+        EXIT;
+out_put_obj:
+        lmv_object_put(obj);
+        return rc;
+}
+
+static int lmv_early_cancel(struct obd_export *exp, struct md_op_data *op_data,
+                            int op_tgt, ldlm_mode_t mode, int bits, int flag)
 {
-        struct lu_fid *fid = md_op_data_fid(op_data, flag);
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *st_exp;
-        struct lmv_obj *obj;
-        int rc = 0;
+        struct lu_fid          *fid = md_op_data_fid(op_data, flag);
+        struct obd_device      *obd = exp->exp_obd;
+        struct lmv_obd         *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc    *tgt;
+        ldlm_policy_data_t      policy = {{0}};
+        struct lmv_object      *obj;
+        int                     rc = 0;
         ENTRY;
 
         if (!fid_is_sane(fid))
                 RETURN(0);
 
-        obj = lmv_obj_grab(obd, fid);
+        obj = lmv_object_find(obd, fid);
         if (obj) {
-                ldlm_policy_data_t policy = {{0}};
-                struct lu_fid *st_fid;
-                int i;
-
-                policy.l_inodebits.bits = bits;
-                for (i = 0; i < obj->lo_objcount; i++) {
-                        st_exp = lmv_get_export(lmv, obj->lo_inodes[i].li_mds);
-                        st_fid = &obj->lo_inodes[i].li_fid;
-                        if (tgt_exp != st_exp) {
-                                rc = md_cancel_unused(st_exp, st_fid, &policy,
-                                                      mode, LDLM_FL_ASYNC,
-                                                      NULL);
-                                if (rc)
-                                        break;
-                        } else {
-                                /* Some export matches to @tgt_exp, do cancel
-                                 * for its fid in mdc */
-                                *fid = *st_fid;
-                                op_data->op_flags |= flag;
-                        }
-                }
-                lmv_obj_put(obj);
+                rc = lmv_early_cancel_slaves(exp, op_data, op_tgt, mode,
+                                             bits, flag);
+                lmv_object_put(obj);
         } else {
-                rc = lmv_early_cancel(lmv, tgt_exp, NULL, op_data,
-                                      mode, bits, flag);
+                tgt = lmv_find_target(lmv, fid);
+                if (IS_ERR(tgt))
+                        RETURN(PTR_ERR(tgt));
+
+                if (tgt->ltd_idx != op_tgt) {
+                        CDEBUG(D_INODE, "EARLY_CANCEL on "DFID"\n", PFID(fid));
+                        policy.l_inodebits.bits = bits;
+                        rc = md_cancel_unused(tgt->ltd_exp, fid, &policy,
+                                              mode, LCF_ASYNC, NULL);
+                } else {
+                        CDEBUG(D_INODE,
+                               "EARLY_CANCEL skip operation target %d on "DFID"\n",
+                               op_tgt, PFID(fid));
+                        op_data->op_flags |= flag;
+                        rc = 0;
+                }
+
         }
         RETURN(rc);
 }
-#endif
 
 /*
  * llite passes fid of an target inode in op_data->op_fid1 and id of directory in
@@ -1830,12 +1994,14 @@ static int lmv_early_cancel_stripes(struct obd_export *exp,
 static int lmv_link(struct obd_export *exp, struct md_op_data *op_data,
                     struct ptlrpc_request **request)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        struct lmv_obj *obj;
-        int rc, loop = 0;
-        mdsno_t mds;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc     *tgt;
+        struct lmv_object       *obj;
+        int                      rc;
+        int                      loop = 0;
+        mdsno_t                  mds;
+        int                      sidx;
         ENTRY;
 
         rc = lmv_check_connect(obd);
@@ -1845,54 +2011,43 @@ static int lmv_link(struct obd_export *exp, struct md_op_data *op_data,
 repeat:
         ++loop;
         LASSERT(loop <= 2);
-        if (op_data->op_namelen != 0) {
-                int mea_idx;
+        LASSERT(op_data->op_namelen != 0);
 
-                /* Usual link request */
-                obj = lmv_obj_grab(obd, &op_data->op_fid2);
-                if (obj) {
-                        mea_idx = raw_name2idx(obj->lo_hashtype,
-                                               obj->lo_objcount,
-                                               op_data->op_name,
-                                               op_data->op_namelen);
-                        op_data->op_fid2 = obj->lo_inodes[mea_idx].li_fid;
-                        mds = obj->lo_inodes[mea_idx].li_mds;
-                        lmv_obj_put(obj);
-                } else {
-                        rc = lmv_fld_lookup(lmv, &op_data->op_fid2, &mds);
-                        if (rc)
-                                RETURN(rc);
-                }
+        CDEBUG(D_INODE, "LINK "DFID":%*s to "DFID"\n",
+               PFID(&op_data->op_fid2), op_data->op_namelen,
+               op_data->op_name, PFID(&op_data->op_fid1));
 
-                CDEBUG(D_OTHER,"link "DFID":%*s to "DFID"\n",
-                       PFID(&op_data->op_fid2), op_data->op_namelen,
-                       op_data->op_name, PFID(&op_data->op_fid1));
+        obj = lmv_object_find(obd, &op_data->op_fid2);
+        if (obj) {
+                sidx = raw_name2idx(obj->lo_hashtype,
+                                    obj->lo_objcount,
+                                    op_data->op_name,
+                                    op_data->op_namelen);
+                op_data->op_fid2 = obj->lo_stripes[sidx].ls_fid;
+                mds = obj->lo_stripes[sidx].ls_mds;
+                lmv_object_put(obj);
         } else {
-                rc = lmv_fld_lookup(lmv, &op_data->op_fid1, &mds);
+                rc = lmv_fld_lookup(lmv, &op_data->op_fid2, &mds);
                 if (rc)
                         RETURN(rc);
-
-                /* request from MDS to acquire i_links for inode by fid1 */
-                CDEBUG(D_OTHER, "inc i_nlinks for "DFID"\n",
-                       PFID(&op_data->op_fid1));
         }
 
-        CDEBUG(D_OTHER, "forward to MDS #"LPU64" ("DFID")\n",
+        CDEBUG(D_INODE, "Forward to mds #%x ("DFID")\n",
                mds, PFID(&op_data->op_fid1));
 
-        op_data->op_fsuid = current->fsuid;
-        op_data->op_fsgid = current->fsgid;
-        op_data->op_cap   = current->cap_effective;
+        op_data->op_fsuid = cfs_curproc_fsuid();
+        op_data->op_fsgid = cfs_curproc_fsgid();
+        op_data->op_cap = cfs_curproc_cap_pack();
+        tgt = lmv_get_target(lmv, mds);
 
-        tgt_exp = lmv->tgts[mds].ltd_exp;
-        if (op_data->op_namelen) {
-                op_data->op_flags |= MF_MDC_CANCEL_FID2;
-                /* Cancel UPDATE lock on child (fid1). */
-                rc = lmv_early_cancel(lmv, tgt_exp, NULL, op_data, LCK_EX,
-                                      MDS_INODELOCK_UPDATE, MF_MDC_CANCEL_FID1);
-        }
+        /*
+         * Cancel UPDATE lock on child (fid1).
+         */
+        op_data->op_flags |= MF_MDC_CANCEL_FID2;
+        rc = lmv_early_cancel(exp, op_data, tgt->ltd_idx, LCK_EX,
+                              MDS_INODELOCK_UPDATE, MF_MDC_CANCEL_FID1);
         if (rc == 0)
-                rc = md_link(tgt_exp, op_data, request);
+                rc = md_link(tgt->ltd_exp, op_data, request);
         if (rc == -ERESTART) {
                 LASSERT(*request != NULL);
                 DEBUG_REQ(D_WARNING|D_RPCTRACE, *request,
@@ -1916,15 +2071,20 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data,
                       const char *old, int oldlen, const char *new, int newlen,
                       struct ptlrpc_request **request)
 {
-        struct obd_export *tgt_exp = NULL, *src_exp;
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        int rc, mea_idx, loop = 0;
-        struct lmv_obj *obj;
-        mdsno_t mds1, mds2;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc     *src_tgt;
+        int                      rc;
+        int                      sidx;
+        int                      loop = 0;
+        struct lmv_object       *obj;
+        mdsno_t                  mds1;
+        mdsno_t                  mds2;
         ENTRY;
 
-        CDEBUG(D_OTHER, "rename %*s in "DFID" to %*s in "DFID"\n",
+        LASSERT(oldlen != 0);
+
+        CDEBUG(D_INODE, "RENAME %*s in "DFID" to %*s in "DFID"\n",
                oldlen, old, PFID(&op_data->op_fid1),
                newlen, new, PFID(&op_data->op_fid2));
 
@@ -1932,112 +2092,83 @@ static int lmv_rename(struct obd_export *exp, struct md_op_data *op_data,
         if (rc)
                 RETURN(rc);
 
-        if (oldlen == 0) {
-                /*
-                 * MDS with old dir entry is asking another MDS to create name
-                 * there.
-                 */
-                CDEBUG(D_OTHER,
-                       "create %*s(%d/%d) in "DFID" pointing "
-                       "to "DFID"\n", newlen, new, oldlen, newlen,
-                       PFID(&op_data->op_fid2), PFID(&op_data->op_fid1));
-
-                rc = lmv_fld_lookup(lmv, &op_data->op_fid2, &mds1);
-                if (rc)
-                        RETURN(rc);
-
-                /*
-                 * Target directory can be split, sowe should forward request to
-                 * the right MDS.
-                 */
-                obj = lmv_obj_grab(obd, &op_data->op_fid2);
-                if (obj) {
-                        mea_idx = raw_name2idx(obj->lo_hashtype,
-                                               obj->lo_objcount,
-                                               (char *)new, newlen);
-                        op_data->op_fid2 = obj->lo_inodes[mea_idx].li_fid;
-                        CDEBUG(D_OTHER, "Parent obj "DFID"\n",
-                               PFID(&op_data->op_fid2));
-                        lmv_obj_put(obj);
-                }
-                goto request;
-        }
-
 repeat:
         ++loop;
         LASSERT(loop <= 2);
-        obj = lmv_obj_grab(obd, &op_data->op_fid1);
+        obj = lmv_object_find(obd, &op_data->op_fid1);
         if (obj) {
-                /*
-                 * directory is already split, so we have to forward request to
-                 * the right MDS.
-                 */
-                mea_idx = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
-                                       (char *)old, oldlen);
-                op_data->op_fid1 = obj->lo_inodes[mea_idx].li_fid;
-                mds1 = obj->lo_inodes[mea_idx].li_mds;
-                CDEBUG(D_OTHER, "Parent obj "DFID"\n", PFID(&op_data->op_fid1));
-                lmv_obj_put(obj);
+                sidx = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
+                                    (char *)old, oldlen);
+                op_data->op_fid1 = obj->lo_stripes[sidx].ls_fid;
+                mds1 = obj->lo_stripes[sidx].ls_mds;
+                CDEBUG(D_INODE, "Parent obj "DFID"\n", PFID(&op_data->op_fid1));
+                lmv_object_put(obj);
         } else {
                 rc = lmv_fld_lookup(lmv, &op_data->op_fid1, &mds1);
                 if (rc)
                         RETURN(rc);
         }
 
-        obj = lmv_obj_grab(obd, &op_data->op_fid2);
+        obj = lmv_object_find(obd, &op_data->op_fid2);
         if (obj) {
                 /*
                  * Directory is already split, so we have to forward request to
                  * the right MDS.
                  */
-                mea_idx = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
+                sidx = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
                                        (char *)new, newlen);
 
-                mds2 = obj->lo_inodes[mea_idx].li_mds;
-                op_data->op_fid2 = obj->lo_inodes[mea_idx].li_fid;
-                CDEBUG(D_OTHER, "Parent obj "DFID"\n", PFID(&op_data->op_fid2));
-                lmv_obj_put(obj);
+                mds2 = obj->lo_stripes[sidx].ls_mds;
+                op_data->op_fid2 = obj->lo_stripes[sidx].ls_fid;
+                CDEBUG(D_INODE, "Parent obj "DFID"\n", PFID(&op_data->op_fid2));
+                lmv_object_put(obj);
         } else {
                 rc = lmv_fld_lookup(lmv, &op_data->op_fid2, &mds2);
                 if (rc)
                         RETURN(rc);
         }
 
-request:
-        op_data->op_fsuid = current->fsuid;
-        op_data->op_fsgid = current->fsgid;
-        op_data->op_cap   = current->cap_effective;
+        op_data->op_fsuid = cfs_curproc_fsuid();
+        op_data->op_fsgid = cfs_curproc_fsgid();
+        op_data->op_cap = cfs_curproc_cap_pack();
 
-        src_exp = lmv_get_export(lmv, mds1);
-        tgt_exp = lmv_get_export(lmv, mds2);
-        if (oldlen) {
-                /* LOOKUP lock on src child (fid3) should also be cancelled for
-                 * src_exp in mdc_rename. */
-                op_data->op_flags |= MF_MDC_CANCEL_FID1 | MF_MDC_CANCEL_FID3;
+        src_tgt = lmv_get_target(lmv, mds1);
 
-                /* Cancel UPDATE locks on tgt parent (fid2), tgt_exp is its
-                 * own export. */
-                rc = lmv_early_cancel(lmv, src_exp, tgt_exp, op_data, LCK_EX,
-                                      MDS_INODELOCK_UPDATE, MF_MDC_CANCEL_FID2);
+        /*
+         * LOOKUP lock on src child (fid3) should also be cancelled for
+         * src_tgt in mdc_rename.
+         */
+        op_data->op_flags |= MF_MDC_CANCEL_FID1 | MF_MDC_CANCEL_FID3;
 
-                /* Cancel LOOKUP locks on tgt child (fid4) for parent tgt_exp.*/
-                if (rc == 0)
-                        rc = lmv_early_cancel(lmv, src_exp, tgt_exp, op_data,
-                                              LCK_EX, MDS_INODELOCK_LOOKUP,
-                                              MF_MDC_CANCEL_FID4);
+        /*
+         * Cancel UPDATE locks on tgt parent (fid2), tgt_tgt is its
+         * own target.
+         */
+        rc = lmv_early_cancel(exp, op_data, src_tgt->ltd_idx,
+                              LCK_EX, MDS_INODELOCK_UPDATE,
+                              MF_MDC_CANCEL_FID2);
 
-                /* XXX: the case when child is a striped dir is not supported.
-                 * Only the master stripe has all locks cancelled early. */
-                /* Cancel all the locks on tgt child (fid4). */
-                if (rc == 0)
-                        rc = lmv_early_cancel(lmv, src_exp, NULL, op_data,
-                                              LCK_EX, MDS_INODELOCK_FULL,
-                                              MF_MDC_CANCEL_FID4);
+        /*
+         * Cancel LOOKUP locks on tgt child (fid4) for parent tgt_tgt.
+         */
+        if (rc == 0) {
+                rc = lmv_early_cancel(exp, op_data, src_tgt->ltd_idx,
+                                      LCK_EX, MDS_INODELOCK_LOOKUP,
+                                      MF_MDC_CANCEL_FID4);
         }
 
+        /*
+         * Cancel all the locks on tgt child (fid4).
+         */
+        if (rc == 0)
+                rc = lmv_early_cancel(exp, op_data, src_tgt->ltd_idx,
+                                      LCK_EX, MDS_INODELOCK_FULL,
+                                      MF_MDC_CANCEL_FID4);
+
         if (rc == 0)
-                rc = md_rename(src_exp, op_data, old, oldlen,
+                rc = md_rename(src_tgt->ltd_exp, op_data, old, oldlen,
                                new, newlen, request);
+
         if (rc == -ERESTART) {
                 LASSERT(*request != NULL);
                 DEBUG_REQ(D_WARNING|D_RPCTRACE, *request,
@@ -2061,41 +2192,42 @@ static int lmv_setattr(struct obd_export *exp, struct md_op_data *op_data,
                        struct ptlrpc_request **request,
                        struct md_open_data **mod)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct ptlrpc_request *req;
-        struct obd_export *tgt_exp;
-        struct lmv_obj *obj;
-        int rc = 0, i;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct ptlrpc_request   *req;
+        struct lmv_tgt_desc     *tgt;
+        struct lmv_object       *obj;
+        int                      rc = 0;
+        int                      i;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        obj = lmv_obj_grab(obd, &op_data->op_fid1);
+        obj = lmv_object_find(obd, &op_data->op_fid1);
 
-        CDEBUG(D_OTHER, "SETATTR for "DFID", valid 0x%x%s\n",
+        CDEBUG(D_INODE, "SETATTR for "DFID", valid 0x%x%s\n",
                PFID(&op_data->op_fid1), op_data->op_attr.ia_valid,
                obj ? ", split" : "");
 
         op_data->op_flags |= MF_MDC_CANCEL_FID1;
         if (obj) {
                 for (i = 0; i < obj->lo_objcount; i++) {
-                        op_data->op_fid1 = obj->lo_inodes[i].li_fid;
+                        op_data->op_fid1 = obj->lo_stripes[i].ls_fid;
 
-                        tgt_exp = lmv_get_export(lmv, obj->lo_inodes[i].li_mds);
-                        if (IS_ERR(tgt_exp)) {
-                                rc = PTR_ERR(tgt_exp);
+                        tgt = lmv_get_target(lmv, obj->lo_stripes[i].ls_mds);
+                        if (IS_ERR(tgt)) {
+                                rc = PTR_ERR(tgt);
                                 break;
                         }
 
-                        rc = md_setattr(tgt_exp, op_data, ea, ealen,
+                        rc = md_setattr(tgt->ltd_exp, op_data, ea, ealen,
                                         ea2, ea2len, &req, mod);
 
-                        if (lu_fid_eq(&obj->lo_fid, &obj->lo_inodes[i].li_fid)) {
+                        if (lu_fid_eq(&obj->lo_fid, &obj->lo_stripes[i].ls_fid)) {
                                 /*
-                                 * this is master object and this request should
+                                 * This is master object and this request should
                                  * be returned back to llite.
                                  */
                                 *request = req;
@@ -2106,13 +2238,13 @@ static int lmv_setattr(struct obd_export *exp, struct md_op_data *op_data,
                         if (rc)
                                 break;
                 }
-                lmv_obj_put(obj);
+                lmv_object_put(obj);
         } else {
-                tgt_exp = lmv_find_export(lmv, &op_data->op_fid1);
-                if (IS_ERR(tgt_exp))
-                        RETURN(PTR_ERR(tgt_exp));
+                tgt = lmv_find_target(lmv, &op_data->op_fid1);
+                if (IS_ERR(tgt))
+                        RETURN(PTR_ERR(tgt));
 
-                rc = md_setattr(tgt_exp, op_data, ea, ealen, ea2,
+                rc = md_setattr(tgt->ltd_exp, op_data, ea, ealen, ea2,
                                 ea2len, request, mod);
         }
         RETURN(rc);
@@ -2121,33 +2253,34 @@ static int lmv_setattr(struct obd_export *exp, struct md_op_data *op_data,
 static int lmv_sync(struct obd_export *exp, const struct lu_fid *fid,
                     struct obd_capa *oc, struct ptlrpc_request **request)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        int rc;
+        struct obd_device         *obd = exp->exp_obd;
+        struct lmv_obd            *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc       *tgt;
+        int                        rc;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        tgt_exp = lmv_find_export(lmv, fid);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        tgt = lmv_find_target(lmv, fid);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
 
-        rc = md_sync(tgt_exp, fid, oc, request);
+        rc = md_sync(tgt->ltd_exp, fid, oc, request);
         RETURN(rc);
 }
 
-/* main purpose of LMV blocking ast is to remove split directory LMV
- * presentation object (struct lmv_obj) attached to the lock being revoked. */
-int lmv_blocking_ast(struct ldlm_lock *lock,
-                     struct ldlm_lock_desc *desc,
+/**
+ * Main purpose of LMV blocking ast is to remove split directory LMV
+ * presentation object (struct lmv_object) attached to the lock being revoked.
+ */
+int lmv_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
                      void *data, int flag)
 {
-        struct lustre_handle lockh;
-        struct lmv_obj *obj;
-        int rc;
+        struct lustre_handle    lockh;
+        struct lmv_object      *obj;
+        int                     rc;
         ENTRY;
 
         switch (flag) {
@@ -2160,17 +2293,19 @@ int lmv_blocking_ast(struct ldlm_lock *lock,
                 }
                 break;
         case LDLM_CB_CANCELING:
-                /* time to drop cached attrs for dirobj */
+                /*
+                 * Time to drop cached attrs for split directory object
+                 */
                 obj = lock->l_ast_data;
                 if (obj) {
-                        CDEBUG(D_OTHER, "cancel %s on "LPU64"/"LPU64
+                        CDEBUG(D_INODE, "Cancel %s on "LPU64"/"LPU64
                                ", master "DFID"\n",
                                lock->l_resource->lr_name.name[3] == 1 ?
                                "LOOKUP" : "UPDATE",
                                lock->l_resource->lr_name.name[0],
                                lock->l_resource->lr_name.name[1],
                                PFID(&obj->lo_fid));
-                        lmv_obj_put(obj);
+                        lmv_object_put(obj);
                 }
                 break;
         default:
@@ -2181,50 +2316,59 @@ int lmv_blocking_ast(struct ldlm_lock *lock,
 
 static void lmv_hash_adjust(__u64 *hash, __u64 hash_adj)
 {
-        __u64 val;
+        __u64         val;
 
         val = le64_to_cpu(*hash);
         if (val < hash_adj)
                 val += MAX_HASH_SIZE;
-        if (val != DIR_END_OFF)
+        if (val != MDS_DIR_END_OFF)
                 *hash = cpu_to_le64(val - hash_adj);
 }
 
 static __u32 lmv_node_rank(struct obd_export *exp, const struct lu_fid *fid)
 {
-        __u64 id;
+        __u64              id;
         struct obd_import *imp;
 
         /*
-         * XXX Hack: to get nid we assume that underlying obd device is mdc.
+         * XXX: to get nid we assume that underlying obd device is mdc.
          */
         imp  = class_exp2cliimp(exp);
         id   = imp->imp_connection->c_self + fid_flatten(fid);
 
-        CDEBUG(D_INFO, "node rank: %llx "DFID" %llx %llx\n",
+        CDEBUG(D_INODE, "Readpage node rank: "LPX64" "DFID" "LPX64" "LPX64"\n",
                imp->imp_connection->c_self, PFID(fid), id, id ^ (id >> 32));
 
         return id ^ (id >> 32);
 }
 
 static int lmv_readpage(struct obd_export *exp, const struct lu_fid *fid,
-                        struct obd_capa *oc, __u64 offset64, struct page *page,
+                        struct obd_capa *oc, __u64 offset64,
+                        struct page **pages, unsigned npages,
                         struct ptlrpc_request **request)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        struct lu_fid rid = *fid;
-        struct lmv_obj *obj;
-        __u64 offset;
-        __u64 hash_adj = 0;
-        __u32 rank = 0;
-        __u64 seg_size = 0;
-        __u64 tgt_tmp = 0;
-        int tgt = 0;
-        int tgt0 = 0;
-        int rc;
-        int nr = 0;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lu_fid            rid = *fid;
+        struct lmv_object       *obj;
+        __u64                    offset;
+        __u64                    hash_adj = 0;
+        __u32                    rank = 0;
+        __u64                    seg_size = 0;
+        __u64                    tgt_tmp = 0;
+        int                      tgt_idx = 0;
+        int                      tgt0_idx = 0;
+        int                      rc;
+        int                      nr = 0;
+        int                      i;
+        /* number of pages read, in CFS_PAGE_SIZE */
+        int                      nrdpgs;
+        /* number of pages transferred in LU_PAGE_SIZE */
+        int                      nlupgs;
+        struct lmv_stripe       *los;
+        struct lmv_tgt_desc     *tgt;
+        struct lu_dirpage       *dp;
+        struct lu_dirent        *ent;
         ENTRY;
 
         offset = offset64;
@@ -2233,10 +2377,7 @@ static int lmv_readpage(struct obd_export *exp, const struct lu_fid *fid,
         if (rc)
                 RETURN(rc);
 
-        CDEBUG(D_INFO, "READPAGE at %llx from "DFID"\n", offset, PFID(&rid));
-
-        obj = lmv_obj_grab(obd, fid);
-        if (obj) {
+        CDEBUG(D_INODE, "READPAGE at "LPX64" from "DFID"\n", offset, PFID(&rid));
 
         /*
          * This case handle directory lookup in clustered metadata case (i.e.
@@ -2258,24 +2399,21 @@ static int lmv_readpage(struct obd_export *exp, const struct lu_fid *fid,
          * [R*MAX_HASH/N ... (R + 1)*MAX_HASH/N] there for we do hash_adj
          * on hash  values that we get.
          */
-
-                struct lmv_inode *loi;
-
-                lmv_obj_lock(obj);
-
+        obj = lmv_object_find_lock(obd, fid);
+        if (obj) {
                 nr       = obj->lo_objcount;
                 LASSERT(nr > 0);
                 seg_size = MAX_HASH_SIZE;
                 do_div(seg_size, nr);
-                loi      = obj->lo_inodes;
-                rank     = lmv_node_rank(lmv_get_export(lmv, loi[0].li_mds),
-                                         fid) % nr;
-                tgt_tmp = offset;
+                los      = obj->lo_stripes;
+                tgt      = lmv_get_target(lmv, los[0].ls_mds);
+                rank     = lmv_node_rank(tgt->ltd_exp, fid) % nr;
+                tgt_tmp  = offset;
                 do_div(tgt_tmp, seg_size);
-                tgt0     = do_div(tgt_tmp,  nr);
-                tgt      = (tgt0 + rank) % nr;
+                tgt0_idx = do_div(tgt_tmp,  nr);
+                tgt_idx  = (tgt0_idx + rank) % nr;
 
-                if (tgt < tgt0)
+                if (tgt_idx < tgt0_idx)
                         /*
                          * Wrap around.
                          *
@@ -2288,187 +2426,191 @@ static int lmv_readpage(struct obd_export *exp, const struct lu_fid *fid,
 
                 hash_adj += rank * seg_size;
 
-                CDEBUG(D_INFO, "hash_adj: %x %llx %llx/%x -> %llx/%x\n",
-                       rank, hash_adj, offset, tgt0, offset + hash_adj, tgt);
+                CDEBUG(D_INODE, "Readpage hash adjustment: %x "LPX64" "
+                       LPX64"/%x -> "LPX64"/%x\n", rank, hash_adj,
+                       offset, tgt0_idx, offset + hash_adj, tgt_idx);
 
                 offset = (offset + hash_adj) & MAX_HASH_SIZE;
-                rid = obj->lo_inodes[tgt].li_fid;
-                tgt_exp = lmv_get_export(lmv, loi[tgt].li_mds);
+                rid = obj->lo_stripes[tgt_idx].ls_fid;
+                tgt = lmv_get_target(lmv, los[tgt_idx].ls_mds);
 
-                CDEBUG(D_INFO, "forward to "DFID" with offset %lu i %d\n",
-                       PFID(&rid), (unsigned long)offset, tgt);
+                CDEBUG(D_INODE, "Forward to "DFID" with offset %lu i %d\n",
+                       PFID(&rid), (unsigned long)offset, tgt_idx);
         } else
-                tgt_exp = lmv_find_export(lmv, &rid);
+                tgt = lmv_find_target(lmv, &rid);
 
-        if (IS_ERR(tgt_exp))
-                GOTO(cleanup, rc = PTR_ERR(tgt_exp));
+        if (IS_ERR(tgt))
+                GOTO(cleanup, rc = PTR_ERR(tgt));
 
-        rc = md_readpage(tgt_exp, &rid, oc, offset, page, request);
+        rc = md_readpage(tgt->ltd_exp, &rid, oc, offset, pages, npages,
+                         request);
         if (rc)
                 GOTO(cleanup, rc);
-        if (obj) {
-                struct lu_dirpage *dp;
-                struct lu_dirent  *ent;
 
-                dp = cfs_kmap(page);
+        nrdpgs = ((*request)->rq_bulk->bd_nob_transferred + CFS_PAGE_SIZE - 1)
+                 >> CFS_PAGE_SHIFT;
+        nlupgs = (*request)->rq_bulk->bd_nob_transferred >> LU_PAGE_SHIFT;
+        LASSERT(!((*request)->rq_bulk->bd_nob_transferred & ~LU_PAGE_MASK));
+        LASSERT(nrdpgs > 0 && nrdpgs <= npages);
 
-                lmv_hash_adjust(&dp->ldp_hash_start, hash_adj);
-                lmv_hash_adjust(&dp->ldp_hash_end,   hash_adj);
-                LASSERT(le64_to_cpu(dp->ldp_hash_start) <= offset64);
+        CDEBUG(D_INODE, "read %d(%d)/%d pages\n", nrdpgs, nlupgs, npages);
 
-                for (ent = lu_dirent_start(dp); ent != NULL;
-                     ent = lu_dirent_next(ent))
-                        lmv_hash_adjust(&ent->lde_hash, hash_adj);
+        for (i = 0; i < nrdpgs; i++) {
+#if CFS_PAGE_SIZE > LU_PAGE_SIZE
+                struct lu_dirpage *first;
+                __u64 hash_end = 0;
+                __u32 flags = 0;
+#endif
+                struct lu_dirent *tmp = NULL;
 
-                if (tgt0 != nr - 1) {
-                        __u64 end;
+                dp = cfs_kmap(pages[i]);
+                if (obj) {
+                        lmv_hash_adjust(&dp->ldp_hash_start, hash_adj);
+                        lmv_hash_adjust(&dp->ldp_hash_end,   hash_adj);
+                        LASSERT(le64_to_cpu(dp->ldp_hash_start) <= offset64);
 
-                        end = le64_to_cpu(dp->ldp_hash_end);
-                        if (end == DIR_END_OFF) {
+                        if ((tgt0_idx != nr - 1) &&
+                            (le64_to_cpu(dp->ldp_hash_end) == MDS_DIR_END_OFF))
+                        {
                                 dp->ldp_hash_end = cpu_to_le32(seg_size *
-                                                               (tgt0 + 1));
-                                CDEBUG(D_INFO, ""DFID" reset end %llx tgt %d\n",
+                                                               (tgt0_idx + 1));
+                                CDEBUG(D_INODE,
+                                       ""DFID" reset end "LPX64" tgt %d\n",
                                        PFID(&rid),
-                                       le64_to_cpu(dp->ldp_hash_end), tgt);
+                                       (__u64)le64_to_cpu(dp->ldp_hash_end),
+                                       tgt_idx);
                         }
                 }
-                cfs_kunmap(page);
-        }
-        /*
-         * Here we could remove "." and ".." from all pages which at not from
-         * master. But MDS has only "." and ".." for master dir.
-         */
-        EXIT;
-cleanup:
-        if (obj) {
-                lmv_obj_unlock(obj);
-                lmv_obj_put(obj);
-        }
-        return rc;
-}
-
-static int lmv_unlink_slaves(struct obd_export *exp,
-                             struct md_op_data *op_data,
-                             struct ptlrpc_request **req)
-{
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct lmv_stripe_md *mea = op_data->op_mea1;
-        struct md_op_data *op_data2;
-        struct obd_export *tgt_exp;
-        int i, rc = 0;
-        ENTRY;
-
-        OBD_ALLOC_PTR(op_data2);
-        if (op_data2 == NULL)
-                RETURN(-ENOMEM);
-
-        op_data2->op_mode = S_IFDIR;
-        op_data2->op_fsuid = current->fsuid;
-        op_data2->op_fsgid = current->fsgid;
-        op_data2->op_bias = 0;
-
-        LASSERT(mea != NULL);
-        for (i = 0; i < mea->mea_count; i++) {
-                memset(op_data2, 0, sizeof(*op_data2));
-                op_data2->op_fid1 = mea->mea_ids[i];
-                tgt_exp = lmv_find_export(lmv, &op_data2->op_fid1);
-                if (IS_ERR(tgt_exp))
-                        GOTO(out_free_op_data2, rc = PTR_ERR(tgt_exp));
 
-                if (tgt_exp == NULL)
-                        continue;
-
-                rc = md_unlink(tgt_exp, op_data2, req);
-
-                CDEBUG(D_OTHER, "unlink slave "DFID" -> %d\n",
-                       PFID(&mea->mea_ids[i]), rc);
+                ent = lu_dirent_start(dp);
+#if CFS_PAGE_SIZE > LU_PAGE_SIZE
+                first = dp;
+                hash_end = dp->ldp_hash_end;
+repeat:
+#endif
+                nlupgs--;
+                for (tmp = ent; ent != NULL;
+                     tmp = ent, ent = lu_dirent_next(ent)) {
+                        if (obj)
+                                lmv_hash_adjust(&ent->lde_hash, hash_adj);
+                }
 
-                if (*req) {
-                        ptlrpc_req_finished(*req);
-                        *req = NULL;
+#if CFS_PAGE_SIZE > LU_PAGE_SIZE
+                dp = (struct lu_dirpage *)((char *)dp + LU_PAGE_SIZE);
+                if (((unsigned long)dp & ~CFS_PAGE_MASK) && nlupgs > 0) {
+                        ent = lu_dirent_start(dp);
+
+                        if (obj) {
+                                lmv_hash_adjust(&dp->ldp_hash_end, hash_adj);
+                                if ((tgt0_idx != nr - 1) &&
+                                    (le64_to_cpu(dp->ldp_hash_end) ==
+                                     MDS_DIR_END_OFF)) {
+                                        hash_end = cpu_to_le32(seg_size *
+                                                               (tgt0_idx + 1));
+                                        CDEBUG(D_INODE,
+                                            ""DFID" reset end "LPX64" tgt %d\n",
+                                            PFID(&rid),
+                                            (__u64)le64_to_cpu(hash_end),
+                                            tgt_idx);
+                                }
+                        }
+                        hash_end = dp->ldp_hash_end;
+                        flags = dp->ldp_flags;
+
+                        if (tmp) {
+                                /* enlarge the end entry lde_reclen from 0 to
+                                 * first entry of next lu_dirpage, in this way
+                                 * several lu_dirpages can be stored into one
+                                 * client page on client. */
+                                tmp = ((void *)tmp) +
+                                      le16_to_cpu(tmp->lde_reclen);
+                                tmp->lde_reclen =
+                                        cpu_to_le16((char *)(dp->ldp_entries) -
+                                                    (char *)tmp);
+                                goto repeat;
+                        }
                 }
-                if (rc)
-                        GOTO(out_free_op_data2, rc);
+                first->ldp_hash_end = hash_end;
+                first->ldp_flags &= ~cpu_to_le32(LDF_COLLIDE);
+                first->ldp_flags |= flags & cpu_to_le32(LDF_COLLIDE);
+#else
+                SET_BUT_UNUSED(tmp);
+#endif
+                cfs_kunmap(pages[i]);
         }
-
         EXIT;
-out_free_op_data2:
-        OBD_FREE_PTR(op_data2);
+cleanup:
+        if (obj)
+                lmv_object_put_unlock(obj);
         return rc;
 }
 
 static int lmv_unlink(struct obd_export *exp, struct md_op_data *op_data,
                       struct ptlrpc_request **request)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp = NULL;
-        struct lmv_obj *obj;
-        int rc, loop = 0;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc     *tgt = NULL;
+        struct lmv_object       *obj;
+        int                      rc;
+        int                      sidx;
+        int                      loop = 0;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        if (op_data->op_namelen == 0 && op_data->op_mea1 != NULL) {
-                /* mds asks to remove slave objects */
-                rc = lmv_unlink_slaves(exp, op_data, request);
-                RETURN(rc);
-        }
-
 repeat:
         ++loop;
         LASSERT(loop <= 2);
-        if (op_data->op_namelen != 0) {
-                int mea_idx;
+        LASSERT(op_data->op_namelen != 0);
 
-                obj = lmv_obj_grab(obd, &op_data->op_fid1);
-                if (obj) {
-                        mea_idx = raw_name2idx(obj->lo_hashtype,
-                                               obj->lo_objcount,
-                                               op_data->op_name,
-                                               op_data->op_namelen);
-                        op_data->op_bias &= ~MDS_CHECK_SPLIT;
-                        op_data->op_fid1 = obj->lo_inodes[mea_idx].li_fid;
-                        tgt_exp = lmv_get_export(lmv,
-                                                 obj->lo_inodes[mea_idx].li_mds);
-                        lmv_obj_put(obj);
-                        CDEBUG(D_OTHER, "unlink '%*s' in "DFID" -> %u\n",
-                               op_data->op_namelen, op_data->op_name,
-                               PFID(&op_data->op_fid1), mea_idx);
-                }
-        } else {
-                CDEBUG(D_OTHER, "drop i_nlink on "DFID"\n",
-                       PFID(&op_data->op_fid1));
+        obj = lmv_object_find(obd, &op_data->op_fid1);
+        if (obj) {
+                sidx = raw_name2idx(obj->lo_hashtype,
+                                    obj->lo_objcount,
+                                    op_data->op_name,
+                                    op_data->op_namelen);
+                op_data->op_bias &= ~MDS_CHECK_SPLIT;
+                op_data->op_fid1 = obj->lo_stripes[sidx].ls_fid;
+                tgt = lmv_get_target(lmv,
+                                     obj->lo_stripes[sidx].ls_mds);
+                lmv_object_put(obj);
+                CDEBUG(D_INODE, "UNLINK '%*s' in "DFID" -> %u\n",
+                       op_data->op_namelen, op_data->op_name,
+                       PFID(&op_data->op_fid1), sidx);
         }
-        if (tgt_exp == NULL) {
-                tgt_exp = lmv_find_export(lmv, &op_data->op_fid1);
-                if (IS_ERR(tgt_exp))
-                        RETURN(PTR_ERR(tgt_exp));
+
+        if (tgt == NULL) {
+                tgt = lmv_find_target(lmv, &op_data->op_fid1);
+                if (IS_ERR(tgt))
+                        RETURN(PTR_ERR(tgt));
                 op_data->op_bias |= MDS_CHECK_SPLIT;
         }
 
-        op_data->op_fsuid = current->fsuid;
-        op_data->op_fsgid = current->fsgid;
-        op_data->op_cap   = current->cap_effective;
+        op_data->op_fsuid = cfs_curproc_fsuid();
+        op_data->op_fsgid = cfs_curproc_fsgid();
+        op_data->op_cap = cfs_curproc_cap_pack();
 
-        /* If child's fid is given, cancel unused locks for it if it is from
-         * another export than parent. */
-        if (op_data->op_namelen) {
-                /* LOOKUP lock for child (fid3) should also be cancelled on 
-                 * parent tgt_exp in mdc_unlink(). */
-                op_data->op_flags |= MF_MDC_CANCEL_FID1 | MF_MDC_CANCEL_FID3;
+        /*
+         * If child's fid is given, cancel unused locks for it if it is from
+         * another export than parent.
+         *
+         * LOOKUP lock for child (fid3) should also be cancelled on parent
+         * tgt_tgt in mdc_unlink().
+         */
+        op_data->op_flags |= MF_MDC_CANCEL_FID1 | MF_MDC_CANCEL_FID3;
+
+        /*
+         * Cancel FULL locks on child (fid3).
+         */
+        rc = lmv_early_cancel(exp, op_data, tgt->ltd_idx, LCK_EX,
+                              MDS_INODELOCK_FULL, MF_MDC_CANCEL_FID3);
 
-                /* XXX: the case when child is a striped dir is not supported.
-                 * Only the master stripe has all locks cancelled early. */
-                /* Cancel FULL locks on child (fid3). */
-                rc = lmv_early_cancel(lmv, tgt_exp, NULL, op_data, LCK_EX,
-                                      MDS_INODELOCK_FULL, MF_MDC_CANCEL_FID3);
-        }
         if (rc == 0)
-                rc = md_unlink(tgt_exp, op_data, request);
+                rc = md_unlink(tgt->ltd_exp, op_data, request);
+
         if (rc == -ERESTART) {
                 LASSERT(*request != NULL);
                 DEBUG_REQ(D_WARNING|D_RPCTRACE, *request,
@@ -2487,44 +2629,9 @@ repeat:
         RETURN(rc);
 }
 
-static int lmv_llog_init(struct obd_device *obd, int group,
-                         struct obd_device *tgt, int count,
-                         struct llog_catid *logid, struct obd_uuid *uuid)
-{
-#if 0
-        struct llog_ctxt *ctxt;
-        int rc;
-        ENTRY;
-
-        LASSERT(group == OBD_LLOG_GROUP);
-        rc = llog_setup(obd, &obd->obd_olg, LLOG_CONFIG_REPL_CTXT, tgt, 0, NULL,
-                        &llog_client_ops);
-        if (rc == 0) {
-                ctxt = llog_group_get_ctxt(&obd->obd_olg, LLOG_CONFIG_REPL_CTXT);
-                llog_initiator_connect(ctxt, tgt);
-                llog_ctxt_put(ctxt);
-        }
-        RETURN(rc);
-#else
-        return 0;
-#endif
-}
-
-static int lmv_llog_finish(struct obd_device *obd, int count)
-{
-        struct llog_ctxt *ctxt;
-        int rc = 0;
-        ENTRY;
-
-        ctxt = llog_get_context(obd, LLOG_CONFIG_REPL_CTXT);
-        if (ctxt)
-                rc = llog_cleanup(ctxt);
-
-        RETURN(rc);
-}
-
 static int lmv_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
 {
+        struct lmv_obd *lmv = &obd->u.lmv;
         int rc = 0;
 
         switch (stage) {
@@ -2532,7 +2639,9 @@ static int lmv_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
                 /* XXX: here should be calling obd_precleanup() down to
                  * stack. */
                 break;
-        case OBD_CLEANUP_SELF_EXP:
+        case OBD_CLEANUP_EXPORTS:
+                fld_client_proc_fini(&lmv->lmv_fld);
+                lprocfs_obd_cleanup(obd);
                 rc = obd_llog_finish(obd, 0);
                 if (rc != 0)
                         CERROR("failed to cleanup llogging subsystems\n");
@@ -2544,16 +2653,17 @@ static int lmv_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
 }
 
 static int lmv_get_info(struct obd_export *exp, __u32 keylen,
-                        void *key, __u32 *vallen, void *val)
+                        void *key, __u32 *vallen, void *val,
+                        struct lov_stripe_md *lsm)
 {
-        struct obd_device *obd;
-        struct lmv_obd *lmv;
-        int rc = 0;
+        struct obd_device       *obd;
+        struct lmv_obd          *lmv;
+        int                      rc = 0;
         ENTRY;
 
         obd = class_exp2obd(exp);
         if (obd == NULL) {
-                CDEBUG(D_IOCTL, "invalid client cookie "LPX64"\n",
+                CDEBUG(D_IOCTL, "Invalid client cookie "LPX64"\n",
                        exp->exp_handle.h_cookie);
                 RETURN(-EINVAL);
         }
@@ -2571,14 +2681,16 @@ static int lmv_get_info(struct obd_export *exp, __u32 keylen,
                 for (i = 0, tgts = lmv->tgts; i < lmv->desc.ld_tgt_count;
                      i++, tgts++) {
 
-                        /* all tgts should be connected when this get called. */
+                        /*
+                         * All tgts should be connected when this gets called.
+                         */
                         if (!tgts || !tgts->ltd_exp) {
                                 CERROR("target not setup?\n");
                                 continue;
                         }
 
                         if (!obd_get_info(tgts->ltd_exp, keylen, key,
-                                          vallen, val))
+                                          vallen, val, NULL))
                                 RETURN(0);
                 }
                 RETURN(-EINVAL);
@@ -2587,18 +2699,23 @@ static int lmv_get_info(struct obd_export *exp, __u32 keylen,
                 if (rc)
                         RETURN(rc);
 
-                /* forwarding this request to first MDS, it should know LOV
-                 * desc. */
+                /*
+                 * Forwarding this request to first MDS, it should know LOV
+                 * desc.
+                 */
                 rc = obd_get_info(lmv->tgts[0].ltd_exp, keylen, key,
-                                  vallen, val);
+                                  vallen, val, NULL);
                 if (!rc && KEY_IS(KEY_CONN_DATA)) {
                         exp->exp_connect_flags =
                         ((struct obd_connect_data *)val)->ocd_connect_flags;
                 }
                 RETURN(rc);
+        } else if (KEY_IS(KEY_TGT_COUNT)) {
+                *((int *)val) = lmv->desc.ld_tgt_count;
+                RETURN(0);
         }
 
-        CDEBUG(D_IOCTL, "invalid key\n");
+        CDEBUG(D_IOCTL, "Invalid key\n");
         RETURN(-EINVAL);
 }
 
@@ -2614,14 +2731,13 @@ int lmv_set_info_async(struct obd_export *exp, obd_count keylen,
 
         obd = class_exp2obd(exp);
         if (obd == NULL) {
-                CDEBUG(D_IOCTL, "invalid client cookie "LPX64"\n",
+                CDEBUG(D_IOCTL, "Invalid client cookie "LPX64"\n",
                        exp->exp_handle.h_cookie);
                 RETURN(-EINVAL);
         }
         lmv = &obd->u.lmv;
 
-        if (KEY_IS(KEY_READ_ONLY) || KEY_IS(KEY_FLUSH_CTX) ||
-            KEY_IS(KEY_INIT_RECOV_BACKUP)) {
+        if (KEY_IS(KEY_READ_ONLY) || KEY_IS(KEY_FLUSH_CTX)) {
                 int i, err = 0;
 
                 for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
@@ -2645,10 +2761,12 @@ int lmv_set_info_async(struct obd_export *exp, obd_count keylen,
 int lmv_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
                struct lov_stripe_md *lsm)
 {
-        struct obd_device *obd = class_exp2obd(exp);
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct lmv_stripe_md *meap, *lsmp;
-        int mea_size, i;
+        struct obd_device         *obd = class_exp2obd(exp);
+        struct lmv_obd            *lmv = &obd->u.lmv;
+        struct lmv_stripe_md      *meap;
+        struct lmv_stripe_md      *lsmp;
+        int                        mea_size;
+        int                        i;
         ENTRY;
 
         mea_size = lmv_get_easize(lmv);
@@ -2656,13 +2774,13 @@ int lmv_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
                 RETURN(mea_size);
 
         if (*lmmp && !lsm) {
-                OBD_FREE(*lmmp, mea_size);
+                OBD_FREE_LARGE(*lmmp, mea_size);
                 *lmmp = NULL;
                 RETURN(0);
         }
 
         if (*lmmp == NULL) {
-                OBD_ALLOC(*lmmp, mea_size);
+                OBD_ALLOC_LARGE(*lmmp, mea_size);
                 if (*lmmp == NULL)
                         RETURN(-ENOMEM);
         }
@@ -2692,12 +2810,13 @@ int lmv_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
 int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
                  struct lov_mds_md *lmm, int lmm_size)
 {
-        struct obd_device *obd = class_exp2obd(exp);
-        struct lmv_stripe_md **tmea = (struct lmv_stripe_md **)lsmp;
-        struct lmv_stripe_md *mea = (struct lmv_stripe_md *)lmm;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        int mea_size, i;
-        __u32 magic;
+        struct obd_device          *obd = class_exp2obd(exp);
+        struct lmv_stripe_md      **tmea = (struct lmv_stripe_md **)lsmp;
+        struct lmv_stripe_md       *mea = (struct lmv_stripe_md *)lmm;
+        struct lmv_obd             *lmv = &obd->u.lmv;
+        int                         mea_size;
+        int                         i;
+        __u32                       magic;
         ENTRY;
 
         mea_size = lmv_get_easize(lmv);
@@ -2705,14 +2824,14 @@ int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
                 return mea_size;
 
         if (*lsmp != NULL && lmm == NULL) {
-                OBD_FREE(*tmea, mea_size);
+                OBD_FREE_LARGE(*tmea, mea_size);
                 *lsmp = NULL;
                 RETURN(0);
         }
 
         LASSERT(mea_size == lmm_size);
 
-        OBD_ALLOC(*tmea, mea_size);
+        OBD_ALLOC_LARGE(*tmea, mea_size);
         if (*tmea == NULL)
                 RETURN(-ENOMEM);
 
@@ -2725,7 +2844,10 @@ int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
         {
                 magic = le32_to_cpu(mea->mea_magic);
         } else {
-                /* old mea is not handled here */
+                /*
+                 * Old mea is not handled here.
+                 */
+                CERROR("Old not supportable EA is found\n");
                 LBUG();
         }
 
@@ -2740,14 +2862,15 @@ int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
         RETURN(mea_size);
 }
 
-static int lmv_cancel_unused(struct obd_export *exp,
-                             const struct lu_fid *fid,
-                             ldlm_policy_data_t *policy,
-                             ldlm_mode_t mode, int flags, void *opaque)
+static int lmv_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 obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        int rc = 0, err, i;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        int                      rc = 0;
+        int                      err;
+        int                      i;
         ENTRY;
 
         LASSERT(fid != NULL);
@@ -2764,13 +2887,16 @@ static int lmv_cancel_unused(struct obd_export *exp,
         RETURN(rc);
 }
 
-int lmv_set_lock_data(struct obd_export *exp, __u64 *lockh, void *data)
+int lmv_set_lock_data(struct obd_export *exp, __u64 *lockh, void *data,
+                      __u64 *bits)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        int                      rc;
         ENTRY;
-        RETURN(md_set_lock_data(lmv->tgts[0].ltd_exp, lockh, data));
+
+        rc =  md_set_lock_data(lmv->tgts[0].ltd_exp, lockh, data, bits);
+        RETURN(rc);
 }
 
 ldlm_mode_t lmv_lock_match(struct obd_export *exp, int flags,
@@ -2778,18 +2904,20 @@ ldlm_mode_t lmv_lock_match(struct obd_export *exp, int flags,
                            ldlm_policy_data_t *policy, ldlm_mode_t mode,
                            struct lustre_handle *lockh)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        ldlm_mode_t rc;
-        int i;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        ldlm_mode_t              rc;
+        int                      i;
         ENTRY;
 
-        CDEBUG(D_OTHER, "lock match for "DFID"\n", PFID(fid));
+        CDEBUG(D_INODE, "Lock match for "DFID"\n", PFID(fid));
 
-        /* with CMD every object can have two locks in different namespaces:
+        /*
+         * With CMD every object can have two locks in different namespaces:
          * lookup lock in space of mds storing direntry and update/open lock in
          * space of mds storing inode. Thus we check all targets, not only that
-         * one fid was created in. */
+         * one fid was created in.
+         */
         for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
                 rc = md_lock_match(lmv->tgts[i].ltd_exp, flags, fid,
                                    type, policy, mode, lockh);
@@ -2804,10 +2932,9 @@ int lmv_get_lustre_md(struct obd_export *exp, struct ptlrpc_request *req,
                       struct obd_export *dt_exp, struct obd_export *md_exp,
                       struct lustre_md *md)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        int rc;
-
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        int                      rc;
         ENTRY;
         rc = md_get_lustre_md(lmv->tgts[0].ltd_exp, req, dt_exp, md_exp, md);
         RETURN(rc);
@@ -2815,12 +2942,12 @@ int lmv_get_lustre_md(struct obd_export *exp, struct ptlrpc_request *req,
 
 int lmv_free_lustre_md(struct obd_export *exp, struct lustre_md *md)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
         ENTRY;
+
         if (md->mea)
-                obd_free_memmd(exp, (struct lov_stripe_md**)&md->mea);
+                obd_free_memmd(exp, (void *)&md->mea);
         RETURN(md_free_lustre_md(lmv->tgts[0].ltd_exp, md));
 }
 
@@ -2828,32 +2955,31 @@ int lmv_set_open_replay_data(struct obd_export *exp,
                              struct obd_client_handle *och,
                              struct ptlrpc_request *open_req)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc     *tgt;
         ENTRY;
 
-        tgt_exp = lmv_find_export(lmv, &och->och_fid);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        tgt = lmv_find_target(lmv, &och->och_fid);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
 
-        RETURN(md_set_open_replay_data(tgt_exp, och, open_req));
+        RETURN(md_set_open_replay_data(tgt->ltd_exp, och, open_req));
 }
 
 int lmv_clear_open_replay_data(struct obd_export *exp,
                                struct obd_client_handle *och)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc     *tgt;
         ENTRY;
 
-        tgt_exp = lmv_find_export(lmv, &och->och_fid);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        tgt = lmv_find_target(lmv, &och->och_fid);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
 
-        RETURN(md_clear_open_replay_data(tgt_exp, och));
+        RETURN(md_clear_open_replay_data(tgt->ltd_exp, och));
 }
 
 static int lmv_get_remote_perm(struct obd_export *exp,
@@ -2861,44 +2987,54 @@ static int lmv_get_remote_perm(struct obd_export *exp,
                                struct obd_capa *oc, __u32 suppgid,
                                struct ptlrpc_request **request)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        int rc;
-
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc     *tgt;
+        int                      rc;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        tgt_exp = lmv_find_export(lmv, fid);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
-
-        rc = md_get_remote_perm(tgt_exp, fid, oc, suppgid, request);
+        tgt = lmv_find_target(lmv, fid);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
 
+        rc = md_get_remote_perm(tgt->ltd_exp, fid, oc, suppgid, request);
         RETURN(rc);
 }
 
 static int lmv_renew_capa(struct obd_export *exp, struct obd_capa *oc,
                           renew_capa_cb_t cb)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        int rc;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc     *tgt;
+        int                      rc;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        tgt_exp = lmv_find_export(lmv, &oc->c_capa.lc_fid);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        tgt = lmv_find_target(lmv, &oc->c_capa.lc_fid);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
+
+        rc = md_renew_capa(tgt->ltd_exp, oc, cb);
+        RETURN(rc);
+}
+
+int lmv_unpack_capa(struct obd_export *exp, struct ptlrpc_request *req,
+                    const struct req_msg_field *field, struct obd_capa **oc)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int rc;
 
-        rc = md_renew_capa(tgt_exp, oc, cb);
+        ENTRY;
+        rc = md_unpack_capa(lmv->tgts[0].ltd_exp, req, field, oc);
         RETURN(rc);
 }
 
@@ -2906,49 +3042,139 @@ int lmv_intent_getattr_async(struct obd_export *exp,
                              struct md_enqueue_info *minfo,
                              struct ldlm_enqueue_info *einfo)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd    *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        int rc;
+        struct md_op_data       *op_data = &minfo->mi_data;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_object       *obj;
+        struct lmv_tgt_desc     *tgt = NULL;
+        int                      rc;
+        int                      sidx;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        if (fid_is_zero(&minfo->mi_data.op_fid2))
-                tgt_exp = lmv_find_export(lmv, &minfo->mi_data.op_fid1);
-        else
-                tgt_exp = lmv_find_export(lmv, &minfo->mi_data.op_fid2);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        if (op_data->op_namelen) {
+                obj = lmv_object_find(obd, &op_data->op_fid1);
+                if (obj) {
+                        sidx = raw_name2idx(obj->lo_hashtype, obj->lo_objcount,
+                                            (char *)op_data->op_name,
+                                            op_data->op_namelen);
+                        op_data->op_fid1 = obj->lo_stripes[sidx].ls_fid;
+                        tgt = lmv_get_target(lmv, obj->lo_stripes[sidx].ls_mds);
+                        lmv_object_put(obj);
+                }
+        }
+
+        if (tgt == NULL)
+                tgt = lmv_find_target(lmv, &op_data->op_fid1);
+
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
 
-        rc = md_intent_getattr_async(tgt_exp, minfo, einfo);
+        rc = md_intent_getattr_async(tgt->ltd_exp, minfo, einfo);
         RETURN(rc);
 }
 
-int lmv_revalidate_lock(struct obd_export *exp,
-                        struct lookup_intent *it,
-                        struct lu_fid *fid)
+int lmv_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,
+                        struct lu_fid *fid, __u64 *bits)
 {
-        struct obd_device *obd = exp->exp_obd;
-        struct lmv_obd    *lmv = &obd->u.lmv;
-        struct obd_export *tgt_exp;
-        int rc;
+        struct obd_device       *obd = exp->exp_obd;
+        struct lmv_obd          *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc     *tgt;
+        int                      rc;
         ENTRY;
 
         rc = lmv_check_connect(obd);
         if (rc)
                 RETURN(rc);
 
-        tgt_exp = lmv_find_export(lmv, fid);
-        if (IS_ERR(tgt_exp))
-                RETURN(PTR_ERR(tgt_exp));
+        tgt = lmv_find_target(lmv, fid);
+        if (IS_ERR(tgt))
+                RETURN(PTR_ERR(tgt));
+
+        rc = md_revalidate_lock(tgt->ltd_exp, it, fid, bits);
+        RETURN(rc);
+}
+
+/**
+ * For lmv, only need to send request to master MDT, and the master MDT will
+ * process with other slave MDTs. The only exception is Q_GETOQUOTA for which
+ * we directly fetch data from the slave MDTs.
+ */
+int lmv_quotactl(struct obd_device *unused, struct obd_export *exp,
+                 struct obd_quotactl *oqctl)
+{
+        struct obd_device   *obd = class_exp2obd(exp);
+        struct lmv_obd      *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc *tgt = &lmv->tgts[0];
+        int                  rc = 0, i;
+        __u64                curspace, curinodes;
+        ENTRY;
+
+        if (!lmv->desc.ld_tgt_count || !tgt->ltd_active) {
+                CERROR("master lmv inactive\n");
+                RETURN(-EIO);
+        }
+
+        if (oqctl->qc_cmd != Q_GETOQUOTA) {
+                rc = obd_quotactl(tgt->ltd_exp, oqctl);
+                RETURN(rc);
+        }
+
+        curspace = curinodes = 0;
+        for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
+                int err;
+                tgt = &lmv->tgts[i];
+
+                if (tgt->ltd_exp == NULL)
+                        continue;
+                if (!tgt->ltd_active) {
+                        CDEBUG(D_HA, "mdt %d is inactive.\n", i);
+                        continue;
+                }
+
+                err = obd_quotactl(tgt->ltd_exp, oqctl);
+                if (err) {
+                        CERROR("getquota on mdt %d failed. %d\n", i, err);
+                        if (!rc)
+                                rc = err;
+                } else {
+                        curspace += oqctl->qc_dqblk.dqb_curspace;
+                        curinodes += oqctl->qc_dqblk.dqb_curinodes;
+                }
+        }
+        oqctl->qc_dqblk.dqb_curspace = curspace;
+        oqctl->qc_dqblk.dqb_curinodes = curinodes;
 
-        rc = md_revalidate_lock(tgt_exp, it, fid);
         RETURN(rc);
 }
 
+int lmv_quotacheck(struct obd_device *unused, struct obd_export *exp,
+                   struct obd_quotactl *oqctl)
+{
+        struct obd_device   *obd = class_exp2obd(exp);
+        struct lmv_obd      *lmv = &obd->u.lmv;
+        struct lmv_tgt_desc *tgt;
+        int                  i, rc = 0;
+        ENTRY;
+
+        for (i = 0, tgt = lmv->tgts; i < lmv->desc.ld_tgt_count; i++, tgt++) {
+                int err;
+
+                if (!tgt->ltd_active) {
+                        CERROR("lmv idx %d inactive\n", i);
+                        RETURN(-EIO);
+                }
+
+                err = obd_quotacheck(tgt->ltd_exp, oqctl);
+                if (err && !rc)
+                        rc = err;
+        }
+
+        RETURN(rc);
+}
 
 struct obd_ops lmv_obd_ops = {
         .o_owner                = THIS_MODULE,
@@ -2959,20 +3185,22 @@ struct obd_ops lmv_obd_ops = {
         .o_connect              = lmv_connect,
         .o_disconnect           = lmv_disconnect,
         .o_statfs               = lmv_statfs,
-        .o_llog_init            = lmv_llog_init,
-        .o_llog_finish          = lmv_llog_finish,
         .o_get_info             = lmv_get_info,
         .o_set_info_async       = lmv_set_info_async,
         .o_packmd               = lmv_packmd,
         .o_unpackmd             = lmv_unpackmd,
         .o_notify               = lmv_notify,
+        .o_get_uuid             = lmv_get_uuid,
         .o_iocontrol            = lmv_iocontrol,
-        .o_fid_delete           = lmv_fid_delete
+        .o_fid_delete           = lmv_fid_delete,
+        .o_quotacheck           = lmv_quotacheck,
+        .o_quotactl             = lmv_quotactl
 };
 
 struct md_ops lmv_md_ops = {
         .m_getstatus            = lmv_getstatus,
         .m_change_cbdata        = lmv_change_cbdata,
+        .m_find_cbdata          = lmv_find_cbdata,
         .m_close                = lmv_close,
         .m_create               = lmv_create,
         .m_done_writing         = lmv_done_writing,
@@ -2997,6 +3225,7 @@ struct md_ops lmv_md_ops = {
         .m_set_open_replay_data = lmv_set_open_replay_data,
         .m_clear_open_replay_data = lmv_clear_open_replay_data,
         .m_renew_capa           = lmv_renew_capa,
+        .m_unpack_capa          = lmv_unpack_capa,
         .m_get_remote_perm      = lmv_get_remote_perm,
         .m_intent_getattr_async = lmv_intent_getattr_async,
         .m_revalidate_lock      = lmv_revalidate_lock
@@ -3005,21 +3234,22 @@ struct md_ops lmv_md_ops = {
 int __init lmv_init(void)
 {
         struct lprocfs_static_vars lvars;
-        int rc;
+        int                        rc;
 
-        obj_cache = cfs_mem_cache_create("lmv_objects",
-                                      sizeof(struct lmv_obj),
-                                      0, 0);
-        if (!obj_cache) {
-                CERROR("error allocating lmv objects cache\n");
+        lmv_object_cache = cfs_mem_cache_create("lmv_objects",
+                                                sizeof(struct lmv_object),
+                                                0, 0);
+        if (!lmv_object_cache) {
+                CERROR("Error allocating lmv objects cache\n");
                 return -ENOMEM;
         }
 
         lprocfs_lmv_init_vars(&lvars);
+
         rc = class_register_type(&lmv_obd_ops, &lmv_md_ops,
                                  lvars.module_vars, LUSTRE_LMV_NAME, NULL);
         if (rc)
-                cfs_mem_cache_destroy(obj_cache);
+                cfs_mem_cache_destroy(lmv_object_cache);
 
         return rc;
 }
@@ -3027,17 +3257,15 @@ int __init lmv_init(void)
 #ifdef __KERNEL__
 static void lmv_exit(void)
 {
-        int rc;
-
         class_unregister_type(LUSTRE_LMV_NAME);
 
-        rc = cfs_mem_cache_destroy(obj_cache);
-        LASSERTF(rc == 0,
-                 "can't free lmv objects cache, %d object(s)"
-                 "still in use\n", atomic_read(&obj_cache_count));
+        LASSERTF(cfs_atomic_read(&lmv_object_count) == 0,
+                 "Can't free lmv objects cache, %d object(s) busy\n",
+                 cfs_atomic_read(&lmv_object_count));
+        cfs_mem_cache_destroy(lmv_object_cache);
 }
 
-MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
+MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
 MODULE_DESCRIPTION("Lustre Logical Metadata Volume OBD driver");
 MODULE_LICENSE("GPL");