Whamcloud - gitweb
b=4019
[fs/lustre-release.git] / lustre / lmv / lmv_obd.c
index 4932ea8..9d6aab1 100644 (file)
@@ -30,6 +30,7 @@
 #include <linux/slab.h>
 #include <linux/pagemap.h>
 #include <asm/div64.h>
+#include <linux/seq_file.h>
 #else
 #include <liblustre.h>
 #endif
 #include <linux/lustre_mds.h>
 #include <linux/obd_class.h>
 #include <linux/obd_ost.h>
-#include <linux/seq_file.h>
 #include <linux/lprocfs_status.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/obd_lmv.h>
 #include "lmv_internal.h"
 
+/* 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 (!)
+ *  -EBADF   : The UUID is found, but the OBD of the wrong type (!)
+ */
+static int lmv_set_mdc_active(struct lmv_obd *lmv, struct obd_uuid *uuid,
+                              int activate)
+{
+        struct obd_device *obd;
+        struct lmv_tgt_desc *tgt;
+        int i, 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);
+        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",
+                       i, tgt->uuid.uuid, tgt->ltd_exp->exp_handle.h_cookie);
+                if (strncmp(uuid->uuid, tgt->uuid.uuid, sizeof uuid->uuid) == 0)
+                        break;
+        }
+
+        if (i == lmv->desc.ld_tgt_count)
+                GOTO(out, rc = -EINVAL);
+
+        obd = class_exp2obd(tgt->ltd_exp);
+        if (obd == NULL)
+                GOTO(out, rc = -ENOTCONN);
+
+        CDEBUG(D_INFO, "Found OBD %s=%s device %d (%p) type %s at LMV idx %d\n",
+               obd->obd_name, obd->obd_uuid.uuid, obd->obd_minor, obd,
+               obd->obd_type->typ_name, i);
+        LASSERT(strcmp(obd->obd_type->typ_name, LUSTRE_MDC_NAME) == 0);
+
+        if (tgt->active == activate) {
+                CDEBUG(D_INFO, "OBD %p already %sactive!\n", obd,
+                       activate ? "" : "in");
+                GOTO(out, rc);
+        }
+
+        CDEBUG(D_INFO, "Marking OBD %p %sactive\n", obd, activate ? "" : "in");
+
+        tgt->active = activate;
+        if (activate)
+                lmv->desc.ld_active_tgt_count++;
+        else
+                lmv->desc.ld_active_tgt_count--;
+
+        EXIT;
+ out:
+        spin_unlock(&lmv->lmv_lock);
+        return rc;
+}
+
+static int lmv_notify(struct obd_device *obd, struct obd_device *watched,
+                      int active)
+{
+        int rc;
+        struct obd_uuid *uuid;
+
+        if (strcmp(watched->obd_type->typ_name, LUSTRE_MDC_NAME)) {
+                CERROR("unexpected notification of %s %s!\n",
+                       watched->obd_type->typ_name,
+                       watched->obd_name);
+                return -EINVAL;
+        }
+        uuid = &watched->u.cli.cl_import->imp_target_uuid;
+
+        /* Set MDC as active before notifying the observer, so the
+         * observer can use the MDC normally.  
+         */
+        rc = lmv_set_mdc_active(&obd->u.lmv, uuid, active);
+        if (rc) {
+                CERROR("%sactivation of %s failed: %d\n",
+                       active ? "" : "de", uuid->uuid, rc);
+                RETURN(rc);
+        }
+
+        if (obd->obd_observer)
+                /* Pass the notification up the chain. */
+                rc = obd_notify(obd->obd_observer, watched, active);
+
+        RETURN(rc);
+}
+
 int lmv_attach(struct obd_device *dev, obd_count len, void *data)
 {
         struct lprocfs_static_vars lvars;
-        struct proc_dir_entry *entry;
         int rc;
         ENTRY;
 
         lprocfs_init_vars(lmv, &lvars);
         rc = lprocfs_obd_attach(dev, lvars.obd_vars);
-        if (rc)
-               RETURN (rc);
-
-        entry = create_proc_entry("target_obd", 0444, dev->obd_proc_entry);
-        if (entry == NULL)
-                RETURN(-ENOMEM);
-        /* entry->proc_fops = &lmv_proc_target_fops; */
-        entry->data = dev;
-
+        if (rc == 0) {
+#ifdef __KERNEL__
+                struct proc_dir_entry *entry;
+                
+                entry = create_proc_entry("target_obd", 0444, dev->obd_proc_entry);
+                if (entry == NULL)
+                        RETURN(-ENOMEM);
+                /* entry->proc_fops = &lmv_proc_target_fops; */
+                entry->data = dev;
+#endif
+       }
         RETURN (rc);
 }
 
@@ -75,11 +167,14 @@ int lmv_detach(struct obd_device *dev)
         return lprocfs_obd_detach(dev);
 }
 
-static int lmv_connect_fake(struct lustre_handle *conn,
-                            struct obd_device *obd,
-                            struct obd_uuid *cluuid)
+/* 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(struct lustre_handle *conn, struct obd_device *obd,
+                       struct obd_uuid *cluuid, unsigned long connect_flags)
 {
         struct lmv_obd *lmv = &obd->u.lmv;
+        struct obd_export *exp;
         int rc;
         ENTRY;
 
@@ -89,42 +184,64 @@ static int lmv_connect_fake(struct lustre_handle *conn,
                 RETURN(rc);
         }
 
-        lmv->exp = class_conn2export(conn);
-        LASSERT(lmv->exp != NULL);
+        exp = class_conn2export(conn);
+        /* 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->cluuid = *cluuid;
+        lmv->connect_flags = connect_flags;
         lmv->connected = 0;
+        lmv->exp = exp;
 
         RETURN(0);
 }
 
-int lmv_connect(struct obd_device *obd)
+void lmv_set_timeouts(struct obd_device *obd)
+{
+        struct lmv_tgt_desc *tgts;
+        struct lmv_obd *lmv;
+        int i;
+
+        lmv = &obd->u.lmv;
+        if (lmv->server_timeout == 0)
+                return;
+
+        if (lmv->connected == 0)
+                return;
+
+        for (i = 0, tgts = lmv->tgts; i < lmv->desc.ld_tgt_count; i++, tgts++) {
+                if (tgts->ltd_exp == NULL)
+                        continue;
+                obd_set_info(tgts->ltd_exp, strlen("inter_mds"),
+                             "inter_mds", 0, NULL);
+        }
+}
+
+/* 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 obd_uuid *cluuid;
         struct lmv_tgt_desc *tgts;
         struct obd_export *exp;
-        int rc, i;
-        ENTRY;
+        int rc, rc2, i;
 
         if (lmv->connected)
-                RETURN(0);
+                return 0;
       
         lmv->connected = 1;
         cluuid = &lmv->cluuid;
         exp = lmv->exp;
+        
         CDEBUG(D_OTHER, "time to connect %s to %s\n",
-                        cluuid->uuid, obd->obd_name);
+               cluuid->uuid, obd->obd_name);
 
-        /* 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);
-        }
-
-        for (i = 0, tgts = lmv->tgts; i < lmv->count; i++, tgts++) {
+        for (i = 0, tgts = lmv->tgts; i < lmv->desc.ld_tgt_count; i++, tgts++) {
                 struct obd_device *tgt_obd;
                 struct obd_uuid lmv_osc_uuid = { "LMV_OSC_UUID" };
                 struct lustre_handle conn = {0, };
@@ -142,7 +259,7 @@ int lmv_connect(struct obd_device *obd)
                 if (obd_uuid_equals(&tgts->uuid, cluuid)) {
                         CDEBUG(D_OTHER, "don't connect back to %s\n",
                                cluuid->uuid);
-                        tgts->exp = NULL;
+                        tgts->ltd_exp = NULL;
                         continue;
                 }
 
@@ -156,35 +273,50 @@ int lmv_connect(struct obd_device *obd)
                         GOTO(out_disc, rc = -EINVAL);
                 }
                 
-                rc = obd_connect(&conn, tgt_obd, &lmv_osc_uuid);
+                rc = obd_connect(&conn, tgt_obd, &lmv_osc_uuid, lmv->connect_flags);
                 if (rc) {
                         CERROR("Target %s connect error %d\n",
                                 tgts->uuid.uuid, rc);
                         GOTO(out_disc, rc);
                 }
-                tgts->exp = class_conn2export(&conn);
+                tgts->ltd_exp = class_conn2export(&conn);
 
-                obd_init_ea_size(tgts->exp, lmv->max_easize,
-                                        lmv->max_cookiesize);
+                obd_init_ea_size(tgts->ltd_exp, lmv->max_easize,
+                                 lmv->max_cookiesize);
                 
                 rc = obd_register_observer(tgt_obd, obd);
                 if (rc) {
                         CERROR("Target %s register_observer error %d\n",
                                tgts->uuid.uuid, rc);
-                        obd_disconnect(tgts->exp, 0);
+                        obd_disconnect(tgts->ltd_exp, 0);
                         GOTO(out_disc, rc);
                 }
 
+                lmv->desc.ld_active_tgt_count++;
+                tgts->active = 1;
+                
                 CDEBUG(D_OTHER, "connected to %s(%s) successfully (%d)\n",
                         tgt_obd->obd_name, tgt_obd->obd_uuid.uuid,
                         atomic_read(&obd->obd_refcount));
         }
 
+        lmv_set_timeouts(obd);
         class_export_put(exp);
-        RETURN (0);
+        return 0;
 
  out_disc:
-        /* FIXME: cleanup here */
+        while (i-- > 0) {
+                struct obd_uuid uuid;
+                --tgts;
+                --lmv->desc.ld_active_tgt_count;
+                tgts->active = 0;
+                /* save for CERROR below; (we know it's terminated) */
+                uuid = tgts->uuid;
+                rc2 = obd_disconnect(tgts->ltd_exp, 0);
+                if (rc2)
+                        CERROR("error: LMV target %s disconnect on MDT idx %d: "
+                               "error %d\n", uuid.uuid, i, rc2);
+        }
         class_disconnect(exp, 0);
         RETURN (rc);
 }
@@ -204,8 +336,8 @@ static int lmv_disconnect(struct obd_export *exp, int flags)
         if (lmv->refcount != 0)
                 goto out_local;
 
-        for (i = 0; i < lmv->count; i++) {
-                if (lmv->tgts[i].exp == NULL)
+        for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
+                if (lmv->tgts[i].ltd_exp == NULL)
                         continue;
 
                 if (obd->obd_no_recov) {
@@ -214,39 +346,89 @@ static int lmv_disconnect(struct obd_export *exp, int flags)
                          * XXX not a back-door flag on the OBD.  Ah well.
                          */
                         struct obd_device *mdc_obd;
-                        mdc_obd = class_exp2obd(lmv->tgts[i].exp);
+                        mdc_obd = class_exp2obd(lmv->tgts[i].ltd_exp);
                         if (mdc_obd)
                                 mdc_obd->obd_no_recov = 1;
                 }
 
                 CDEBUG(D_OTHER, "disconnected from %s(%s) successfully\n",
-                        lmv->tgts[i].exp->exp_obd->obd_name,
-                        lmv->tgts[i].exp->exp_obd->obd_uuid.uuid);
+                        lmv->tgts[i].ltd_exp->exp_obd->obd_name,
+                        lmv->tgts[i].ltd_exp->exp_obd->obd_uuid.uuid);
 
-                obd_register_observer(lmv->tgts[i].exp->exp_obd, NULL);
+                obd_register_observer(lmv->tgts[i].ltd_exp->exp_obd, NULL);
 
-                rc = obd_disconnect(lmv->tgts[i].exp, flags);
-                lmv->tgts[i].exp = NULL;
+                rc = obd_disconnect(lmv->tgts[i].ltd_exp, flags);
+                if (rc) {
+                        if (lmv->tgts[i].active) {
+                                CERROR("Target %s disconnect error %d\n",
+                                       lmv->tgts[i].uuid.uuid, rc);
+                        }
+                        rc = 0;
+                }
+                if (lmv->tgts[i].active) {
+                        lmv->desc.ld_active_tgt_count--;
+                        lmv->tgts[i].active = 0;
+                }
+                lmv->tgts[i].ltd_exp = NULL;
         }
 
- out_local:
-        /* FIXME: cleanup here */
+out_local:
+        /* this is the case when no real connection is established by
+         * lmv_check_connect(). */
         if (!lmv->connected)
                 class_export_put(exp);
         rc = class_disconnect(exp, 0);
+        if (lmv->refcount == 0)
+                lmv->connected = 0;
+        RETURN(rc);
+}
+
+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;
+
+        ENTRY;
+
+        if (lmv->desc.ld_tgt_count == 0)
+                RETURN(-ENOTTY);
+        
+        for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
+                int err;
+
+                if (lmv->tgts[i].ltd_exp == NULL) {
+                        CWARN("%s: NULL export for %d\n", obddev->obd_name, i);
+                        continue;
+                }
+
+                err = obd_iocontrol(cmd, lmv->tgts[i].ltd_exp, len, karg, uarg);
+                if (err) {
+                        if (lmv->tgts[i].active) {
+                                CERROR("error: iocontrol MDC %s on MDT"
+                                       "idx %d: err = %d\n",
+                                       lmv->tgts[i].uuid.uuid, i, err);
+                                if (!rc)
+                                        rc = err;
+                        }
+                } else
+                        set = 1;
+        }
+        if (!set && !rc)
+                rc = -EIO;
+
         RETURN(rc);
 }
 
 static int lmv_setup(struct obd_device *obd, obd_count len, void *buf)
 {
-        struct lustre_cfg *lcfg = buf;
+        int i, rc = 0;
         struct lmv_desc *desc;
-        struct lmv_obd *lmv = &obd->u.lmv;
         struct obd_uuid *uuids;
         struct lmv_tgt_desc *tgts;
-        int i;
-        int count;
-        int rc = 0;
+        struct lustre_cfg *lcfg = buf;
+        struct lmv_obd *lmv = &obd->u.lmv;
         ENTRY;
 
         if (lcfg->lcfg_inllen1 < 1) {
@@ -266,30 +448,38 @@ static int lmv_setup(struct obd_device *obd, obd_count len, void *buf)
                 RETURN(-EINVAL);
         }
 
-        count = desc->ld_count;
         uuids = (struct obd_uuid *)lcfg->lcfg_inlbuf2;
-        if (sizeof(*uuids) * count != lcfg->lcfg_inllen2) {
+        if (sizeof(*uuids) * desc->ld_tgt_count != lcfg->lcfg_inllen2) {
                 CERROR("UUID array size wrong: %u * %u != %u\n",
-                       sizeof(*uuids), count, lcfg->lcfg_inllen2);
+                       sizeof(*uuids), desc->ld_tgt_count, lcfg->lcfg_inllen2);
                 RETURN(-EINVAL);
         }
 
-        lmv->bufsize = sizeof(struct lmv_tgt_desc) * count;
+        lmv->bufsize = sizeof(struct lmv_tgt_desc) * desc->ld_tgt_count;
         OBD_ALLOC(lmv->tgts, lmv->bufsize);
         if (lmv->tgts == NULL) {
                 CERROR("Out of memory\n");
-                RETURN(-EINVAL);
+                RETURN(-ENOMEM);
         }
 
-        for (i = 0, tgts = lmv->tgts; i < count; i++, tgts++) {
+        lmv->desc = *desc;
+        spin_lock_init(&lmv->lmv_lock);
+        
+        for (i = 0, tgts = lmv->tgts; i < desc->ld_tgt_count; i++, tgts++)
                 tgts->uuid = uuids[i];
-                lmv->count++;
-        }
-
-        lmv->max_easize = sizeof(struct ll_fid) * lmv->count
-                                        + sizeof(struct mea);
+        
         lmv->max_cookiesize = 0;
 
+        lmv->max_easize = sizeof(struct ll_fid) *
+                desc->ld_tgt_count + sizeof(struct mea);
+        
+        rc = lmv_setup_mgr(obd);
+        if (rc) {
+                CERROR("Can't setup LMV object manager, "
+                       "error %d.\n", rc);
+                OBD_FREE(lmv->tgts, lmv->bufsize);
+        }
+
         RETURN(rc);
 }
 
@@ -300,12 +490,21 @@ static int lmv_statfs(struct obd_device *obd, struct obd_statfs *osfs,
         struct obd_statfs temp;
         int rc = 0, i;
         ENTRY;
-        lmv_connect(obd);
-        for (i = 0; i < lmv->count; i++) {
-                rc = obd_statfs(lmv->tgts[i].exp->exp_obd, &temp, max_age);
+        
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
+                
+        for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
+                if (lmv->tgts[i].ltd_exp == NULL) {
+                        CWARN("%s: NULL export for %d\n", obd->obd_name, i);
+                        continue;
+                }
+
+                rc = obd_statfs(lmv->tgts[i].ltd_exp->exp_obd, &temp, max_age);
                 if (rc) {
                         CERROR("can't stat MDS #%d (%s)\n", i,
-                               lmv->tgts[i].exp->exp_obd->obd_name);
+                               lmv->tgts[i].ltd_exp->exp_obd->obd_name);
                         RETURN(rc);
                 }
                 if (i == 0) {
@@ -324,7 +523,7 @@ static int lmv_cleanup(struct obd_device *obd, int flags)
 {
         struct lmv_obd *lmv = &obd->u.lmv;
         ENTRY;
-        lmv_cleanup_objs(obd);
+        lmv_cleanup_mgr(obd);
         OBD_FREE(lmv->tgts, lmv->bufsize);
         RETURN(0);
 }
@@ -335,56 +534,102 @@ static int lmv_getstatus(struct obd_export *exp, struct ll_fid *fid)
         struct lmv_obd *lmv = &obd->u.lmv;
         int rc;
         ENTRY;
-        lmv_connect(obd);
-        rc = md_getstatus(lmv->tgts[0].exp, fid);
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
+        rc = md_getstatus(lmv->tgts[0].ltd_exp, fid);
         fid->mds = 0;
         RETURN(rc);
 }
 
 static int lmv_getattr(struct obd_export *exp, struct ll_fid *fid,
-                unsigned long valid, unsigned int ea_size,
-                struct ptlrpc_request **request)
+                       unsigned long valid, unsigned int ea_size,
+                       struct ptlrpc_request **request)
 {
         struct obd_device *obd = exp->exp_obd;
         struct lmv_obd *lmv = &obd->u.lmv;
         int rc, i = fid->mds;
         struct lmv_obj *obj;
         ENTRY;
-        lmv_connect(obd);
-        obj = lmv_grab_obj(obd, fid, 0);
+
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
+
+        LASSERT(i < lmv->desc.ld_tgt_count);
+
+        rc = md_getattr(lmv->tgts[i].ltd_exp, fid, valid,
+                        ea_size, request);
+        if (rc)
+                RETURN(rc);
+        
+        obj = lmv_grab_obj(obd, fid);
+        
         CDEBUG(D_OTHER, "GETATTR for %lu/%lu/%lu %s\n",
-               (unsigned long) fid->mds,
-               (unsigned long) fid->id,
-               (unsigned long) fid->generation,
-               obj ? "(splitted)" : "");
-
-        LASSERT(fid->mds < lmv->count);
-        rc = md_getattr(lmv->tgts[i].exp, fid,
-                             valid, ea_size, request);
-        if (rc == 0 && obj) {
-                /* we have to loop over dirobjs here and gather attrs
-                 * for all the slaves */
-#warning "attrs gathering here"
+               (unsigned long)fid->mds, (unsigned long)fid->id,
+               (unsigned long)fid->generation, obj ? "(splitted)" : "");
+
+        /* if object is splitted, then we loop over all the slaves and gather
+         * size attribute. In ideal world we would have to gather also mds field
+         * from all slaves, as object is spread over the cluster and this is
+         * definitely interesting information and it is not good to loss it,
+         * but...*/
+        if (obj) {
+                struct mds_body *body;
+
+                if (*request == NULL) {
+                        lmv_put_obj(obj);
+                        RETURN(rc);
+                }
+                        
+                body = lustre_msg_buf((*request)->rq_repmsg, 0,
+                                      sizeof(*body));
+                LASSERT(body != NULL);
+
+                lmv_lock_obj(obj);
+        
+                for (i = 0; i < obj->objcount; i++) {
+
+                        if (lmv->tgts[i].ltd_exp == NULL) {
+                                CWARN("%s: NULL export for %d\n",
+                                      obd->obd_name, i);
+                                continue;
+                        }
+
+                        /* skip master obj. */
+                        if (fid_equal(&obj->fid, &obj->objs[i].fid))
+                                continue;
+                        
+                        body->size += obj->objs[i].size;
+                }
+
+                lmv_unlock_obj(obj);
+                lmv_put_obj(obj);
         }
-        lmv_put_obj(obj);
+        
         RETURN(rc);
 }
 
-static int lmv_change_cbdata(struct obd_export *exp,
-                                 struct ll_fid *fid, 
-                                 ldlm_iterator_t it, void *data)
+static int lmv_change_cbdata(struct obd_export *exp, struct ll_fid *fid, 
+                             ldlm_iterator_t it, void *data)
 {
         struct obd_device *obd = exp->exp_obd;
         struct lmv_obd *lmv = &obd->u.lmv;
         int rc = 0;
         ENTRY;
-        lmv_connect(obd);
-        CDEBUG(D_OTHER, "CBDATA for %lu/%lu/%lu\n",
-               (unsigned long) fid->mds,
-               (unsigned long) fid->id,
-               (unsigned long) fid->generation);
-        LASSERT(fid->mds < lmv->count);
-        rc = md_change_cbdata(lmv->tgts[fid->mds].exp, fid, it, data);
+        
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
+        
+        CDEBUG(D_OTHER, "CBDATA for %lu/%lu/%lu\n", (unsigned long)fid->mds,
+               (unsigned long)fid->id, (unsigned long)fid->generation);
+        
+        LASSERT(fid->mds < lmv->desc.ld_tgt_count);
+
+        rc = md_change_cbdata(lmv->tgts[fid->mds].ltd_exp,
+                              fid, it, data);
+        
         RETURN(rc);
 }
 
@@ -397,24 +642,30 @@ static int lmv_change_cbdata_name(struct obd_export *exp, struct ll_fid *pfid,
         struct lmv_obj *obj;
         int rc = 0, mds;
         ENTRY;
-        lmv_connect(obd);
-        LASSERT(pfid->mds < lmv->count);
-        LASSERT(cfid->mds < lmv->count);
+
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
+
+        LASSERT(pfid->mds < lmv->desc.ld_tgt_count);
+        LASSERT(cfid->mds < lmv->desc.ld_tgt_count);
+        
         CDEBUG(D_OTHER, "CBDATA for %lu/%lu/%lu:%*s -> %lu/%lu/%lu\n",
-               (unsigned long) pfid->mds, (unsigned long) pfid->id,
-               (unsigned long) pfid->generation, len, name,
-               (unsigned long) cfid->mds, (unsigned long) cfid->id,
-               (unsigned long) cfid->generation);
+               (unsigned long)pfid->mds, (unsigned long)pfid->id,
+               (unsigned long)pfid->generation, len, name,
+               (unsigned long)cfid->mds, (unsigned long)cfid->id,
+               (unsigned long)cfid->generation);
 
-        /* this is default mds for directory name belongs to */
+        /* this is default mds for directory name belongs to. */
         mds = pfid->mds;
-        obj = lmv_grab_obj(obd, pfid, 0);
+        obj = lmv_grab_obj(obd, pfid);
         if (obj) {
-                /* directory is splitted. look for right mds for this name */
-                mds = raw_name2idx(obj->objcount, name, len);
+                /* directory is splitted. look for right mds for this name. */
+                mds = raw_name2idx(obj->hashtype, obj->objcount, name, len);
+                mds = obj->objs[mds].fid.mds;
                 lmv_put_obj(obj);
         }
-        rc = md_change_cbdata(lmv->tgts[mds].exp, cfid, it, data);
+        rc = md_change_cbdata(lmv->tgts[mds].ltd_exp, cfid, it, data);
         RETURN(rc);
 }
 
@@ -424,13 +675,13 @@ static int lmv_valid_attrs(struct obd_export *exp, struct ll_fid *fid)
         struct lmv_obd *lmv = &obd->u.lmv;
         int rc = 0;
         ENTRY;
-        lmv_connect(obd);
-        CDEBUG(D_OTHER, "validate %lu/%lu/%lu\n",
-               (unsigned long) fid->mds,
-               (unsigned long) fid->id,
-               (unsigned long) fid->generation);
-        LASSERT(fid->mds < lmv->count);
-        rc = md_valid_attrs(lmv->tgts[fid->mds].exp, fid);
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
+        CDEBUG(D_OTHER, "validate %lu/%lu/%lu\n", (unsigned long) fid->mds,
+               (unsigned long) fid->id, (unsigned long) fid->generation);
+        LASSERT(fid->mds < lmv->desc.ld_tgt_count);
+        rc = md_valid_attrs(lmv->tgts[fid->mds].ltd_exp, fid);
         RETURN(rc);
 }
 
@@ -442,85 +693,118 @@ int lmv_close(struct obd_export *exp, struct obdo *obdo,
         struct lmv_obd *lmv = &obd->u.lmv;
         int rc, i = obdo->o_mds;
         ENTRY;
-        lmv_connect(obd);
-        LASSERT(i < lmv->count);
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
+        LASSERT(i < lmv->desc.ld_tgt_count);
         CDEBUG(D_OTHER, "CLOSE %lu/%lu/%lu\n", (unsigned long) obdo->o_mds,
                (unsigned long) obdo->o_id, (unsigned long) obdo->o_generation);
-        rc = md_close(lmv->tgts[i].exp, obdo, och, request);
+        rc = md_close(lmv->tgts[i].ltd_exp, obdo, och, request);
+        RETURN(rc);
+}
+
+int lmv_get_mea_and_update_object(struct obd_export *exp, struct ll_fid *fid)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct ptlrpc_request *req = NULL;
+        struct lmv_obj *obj;
+        struct lustre_md md;
+        unsigned long valid;
+        int mealen, rc;
+
+        md.mea = NULL;
+        mealen = MEA_SIZE_LMV(lmv);
+        
+        valid = OBD_MD_FLEASIZE | OBD_MD_FLDIREA;
+
+        /* time to update mea of parent fid */
+        rc = md_getattr(lmv->tgts[fid->mds].ltd_exp, fid,
+                        valid, mealen, &req);
+        if (rc) {
+                CERROR("md_getattr() failed, error %d\n", rc);
+                GOTO(cleanup, rc);
+        }
+
+        rc = mdc_req2lustre_md(exp, req, 0, NULL, &md);
+        if (rc) {
+                CERROR("mdc_req2lustre_md() failed, error %d\n", rc);
+                GOTO(cleanup, rc);
+        }
+
+        if (md.mea == NULL)
+                GOTO(cleanup, rc = -ENODATA);
+
+        obj = lmv_create_obj(exp, fid, md.mea);
+        if (IS_ERR(obj))
+                rc = PTR_ERR(obj);
+        
+        lmv_put_obj(obj);
+        obd_free_memmd(exp, (struct lov_stripe_md **)&md.mea);
+
+cleanup:
+        if (req)
+                ptlrpc_req_finished(req);
         RETURN(rc);
 }
 
 int lmv_create(struct obd_export *exp, struct mdc_op_data *op_data,
-                   const void *data, int datalen, int mode, __u32 uid,
-                   __u32 gid, __u64 rdev, struct ptlrpc_request **request)
+               const void *data, int datalen, int mode, __u32 uid,
+               __u32 gid, __u64 rdev, struct ptlrpc_request **request)
 {
         struct obd_device *obd = exp->exp_obd;
         struct lmv_obd *lmv = &obd->u.lmv;
-        struct mea *mea = op_data->mea1;
-        struct mds_body *mds_body;
-        int rc, i, mds, free_mea = 0;
+        struct mds_body *body;
         struct lmv_obj *obj;
+        int rc, mds, loop = 0;
         ENTRY;
-        lmv_connect(obd);
-        /* TODO: where to create new directories?
-         * current design don't support directory on a slave MDS,
-         * but we lookup by name may forward any request in slave
-         */
+
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
+
+        if (!lmv->desc.ld_active_tgt_count)
+                RETURN(-EIO);
 repeat:
-        obj = lmv_grab_obj(obd, &op_data->fid1, 0);
+        LASSERT(++loop <= 2);
+        obj = lmv_grab_obj(obd, &op_data->fid1);
         if (obj) {
-                mds = raw_name2idx(obj->objcount, op_data->name,
-                                        op_data->namelen - 1);
+                mds = raw_name2idx(obj->hashtype, obj->objcount, op_data->name,
+                                   op_data->namelen);
                 op_data->fid1 = obj->objs[mds].fid;
                 lmv_put_obj(obj);
         }
 
-        CDEBUG(D_OTHER, "CREATE '%*s' on %lu/%lu/%lu (mea 0x%p)\n",
-                        op_data->namelen, op_data->name,
-                        (unsigned long) op_data->fid1.mds,
-                        (unsigned long) op_data->fid1.id,
-                        (unsigned long) op_data->fid1.generation, mea);
-        rc = md_create(lmv->tgts[op_data->fid1.mds].exp, op_data, data,
+        CDEBUG(D_OTHER, "CREATE '%*s' on %lu/%lu/%lu\n", op_data->namelen,
+               op_data->name, (unsigned long)op_data->fid1.mds,
+               (unsigned long)op_data->fid1.id,
+               (unsigned long)op_data->fid1.generation);
+        
+        rc = md_create(lmv->tgts[op_data->fid1.mds].ltd_exp, op_data, data,
                        datalen, mode, uid, gid, rdev, request);
         if (rc == 0) {
                 if (*request == NULL)
-                     RETURN(rc);
-                mds_body = lustre_msg_buf((*request)->rq_repmsg, 0,
-                                          sizeof(*mds_body));
-                LASSERT(mds_body != NULL);
-                CDEBUG(D_OTHER, "created. id = %lu, generation = %lu, mds = %d\n",
-                       (unsigned long) mds_body->fid1.id,
-                       (unsigned long) mds_body->fid1.generation,
-                       op_data->fid1.mds);
-                LASSERT(mds_body->valid & OBD_MD_MDS ||
-                                mds_body->mds == op_data->fid1.mds);
-        } else if (rc == -ESTALE) {
-                struct ptlrpc_request *req = NULL;
-                struct lustre_md md;
-                int mealen;
-                
-                LBUG(); /* FIXME ASAP */
-                CDEBUG(D_OTHER, "it seems MDS splitted dir\n");
-                LASSERT(mea == NULL);
-
-                mealen = sizeof(struct ll_fid)*lmv->count + sizeof(struct mea);
-                /* time to update mea of parent fid */
-                i = op_data->fid1.mds;
-                rc = md_getattr(lmv->tgts[i].exp, &op_data->fid1,
-                                        OBD_MD_FLEASIZE, mealen, &req);
-                LASSERT(rc == 0);
-                md.mea = NULL;
-                rc = mdc_req2lustre_md(req, 0, NULL, exp, &md);
-                LASSERT(rc == 0);
-                LASSERT(md.mea != NULL);
-                mea = md.mea;
-                ptlrpc_req_finished(req);
-                free_mea = 1;
+                        RETURN(rc);
 
-                goto repeat;
+                body = lustre_msg_buf((*request)->rq_repmsg, 0,
+                                      sizeof(*body));
+                LASSERT(body != NULL);
+                
+                CDEBUG(D_OTHER, "created. id = %lu, generation = %lu, "
+                       "mds = %d\n", (unsigned long)body->fid1.id,
+                       (unsigned long)body->fid1.generation, op_data->fid1.mds);
+                
+                LASSERT(body->valid & OBD_MD_MDS ||
+                        body->mds == op_data->fid1.mds);
+        } else if (rc == -ERESTART) {
+                /* directory got splitted. time to update local object and
+                 * repeat the request with proper MDS */
+                rc = lmv_get_mea_and_update_object(exp, &op_data->fid1);
+                if (rc == 0) {
+                        ptlrpc_req_finished(*request);
+                        goto repeat;
+                }
         }
-        if (free_mea)
-                obd_free_memmd(exp, (struct lov_stripe_md**) &mea);
         RETURN(rc);
 }
 
@@ -530,40 +814,108 @@ int lmv_done_writing(struct obd_export *exp, struct obdo *obdo)
         struct lmv_obd *lmv = &obd->u.lmv;
         int rc;
         ENTRY;
-        lmv_connect(obd);
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
+
         /* FIXME: choose right MDC here */
-        rc = md_done_writing(lmv->tgts[0].exp, obdo);
+        CWARN("this method isn't implemented yet\n");
+        rc = md_done_writing(lmv->tgts[0].ltd_exp, obdo);
+        RETURN(rc);
+}
+
+int lmv_enqueue_slaves(struct obd_export *exp, int locktype,
+                       struct lookup_intent *it, int lockmode,
+                       struct mdc_op_data *data, struct lustre_handle *lockh,
+                       void *lmm, int lmmsize, ldlm_completion_callback cb_completion,
+                       ldlm_blocking_callback cb_blocking, void *cb_data)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mea *mea = data->mea1;
+        struct mdc_op_data data2;
+        int i, rc, mds;
+        ENTRY;
+
+        LASSERT(mea != NULL);
+        for (i = 0; i < mea->mea_count; i++) {
+                memset(&data2, 0, sizeof(data2));
+                data2.fid1 = mea->mea_fids[i];
+                mds = data2.fid1.mds;
+                
+                if (lmv->tgts[mds].ltd_exp == NULL)
+                        continue;
+
+                rc = md_enqueue(lmv->tgts[mds].ltd_exp, locktype, it, lockmode,
+                                &data2, lockh + i, lmm, lmmsize, cb_completion,
+                                cb_blocking, cb_data);
+                
+                CDEBUG(D_OTHER, "take lock on slave %lu/%lu/%lu -> %d/%d\n",
+                       (unsigned long)mea->mea_fids[i].mds,
+                       (unsigned long)mea->mea_fids[i].id,
+                       (unsigned long)mea->mea_fids[i].generation,
+                       rc, it->d.lustre.it_status);
+                if (rc)
+                        GOTO(cleanup, rc);
+                if (it->d.lustre.it_data) {
+                        struct ptlrpc_request *req;
+                        req = (struct ptlrpc_request *) it->d.lustre.it_data;
+                        ptlrpc_req_finished(req);
+                }
+                
+                if (it->d.lustre.it_status)
+                        GOTO(cleanup, rc = it->d.lustre.it_status);
+        }
+        RETURN(0);
+        
+cleanup:
+        /* drop all taken locks */
+        while (--i >= 0) {
+                if (lockh[i].cookie)
+                        ldlm_lock_decref(lockh + i, lockmode);
+                lockh[i].cookie = 0;
+        }
         RETURN(rc);
 }
 
 int lmv_enqueue(struct obd_export *exp, int lock_type,
-                    struct lookup_intent *it, int lock_mode,
-                    struct mdc_op_data *data, struct lustre_handle *lockh,
-                    void *lmm, int lmmsize,
-                    ldlm_completion_callback cb_completion,
-                    ldlm_blocking_callback cb_blocking, void *cb_data)
+                struct lookup_intent *it, int lock_mode,
+                struct mdc_op_data *data, struct lustre_handle *lockh,
+                void *lmm, int lmmsize, ldlm_completion_callback cb_completion,
+                ldlm_blocking_callback cb_blocking, void *cb_data)
 {
         struct obd_device *obd = exp->exp_obd;
         struct lmv_obd *lmv = &obd->u.lmv;
         struct lmv_obj *obj;
         int rc, mds;
         ENTRY;
-        lmv_connect(obd);
+
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
+
+        if (it->it_op == IT_UNLINK) {
+                rc = lmv_enqueue_slaves(exp, lock_type, it, lock_mode,
+                                        data, lockh, lmm, lmmsize,
+                                        cb_completion, cb_blocking, cb_data);
+                RETURN(rc);
+        }
+
         if (data->namelen) {
-                obj = lmv_grab_obj(obd, &data->fid1, 0);
+                obj = lmv_grab_obj(obd, &data->fid1);
                 if (obj) {
-                        /* directory is splitted. look for
-                         * right mds for this name */
-                        mds = raw_name2idx(obj->objcount, data->name,
-                                                data->namelen);
+                        /* directory is splitted. look for right mds for this
+                         * name */
+                        mds = raw_name2idx(obj->hashtype, obj->objcount,
+                                           (char *)data->name, data->namelen);
                         data->fid1 = obj->objs[mds].fid;
                         lmv_put_obj(obj);
                 }
         }
-        CDEBUG(D_OTHER, "ENQUEUE '%s' on %lu/%lu\n",
-               LL_IT2STR(it), (unsigned long) data->fid1.id,
-               (unsigned long) data->fid1.generation);
-        rc = md_enqueue(lmv->tgts[data->fid1.mds].exp, lock_type, it,
+        CDEBUG(D_OTHER, "ENQUEUE '%s' on %lu/%lu\n", LL_IT2STR(it),
+               (unsigned long)data->fid1.id, (unsigned long)data->fid1.generation);
+        
+        rc = md_enqueue(lmv->tgts[data->fid1.mds].ltd_exp, lock_type, it,
                         lock_mode, data, lockh, lmm, lmmsize, cb_completion,
                         cb_blocking, cb_data);
 
@@ -571,35 +923,71 @@ int lmv_enqueue(struct obd_export *exp, int lock_type,
 }
 
 int lmv_getattr_name(struct obd_export *exp, struct ll_fid *fid,
-                         char *filename, int namelen, unsigned long valid,
-                         unsigned int ea_size, struct ptlrpc_request **request)
+                     char *filename, int namelen, unsigned long valid,
+                     unsigned int ea_size, struct ptlrpc_request **request)
 {
         struct obd_device *obd = exp->exp_obd;
         struct lmv_obd *lmv = &obd->u.lmv;
         struct ll_fid rfid = *fid;
-        int rc, mds = fid->mds;
+        int rc, mds = fid->mds, loop = 0;
+        struct mds_body *body;
         struct lmv_obj *obj;
         ENTRY;
-        lmv_connect(obd);
-        CDEBUG(D_OTHER, "getattr_name for %*s on %lu/%lu/%lu\n",
-               namelen - 1, filename, (unsigned long) fid->mds,
-               (unsigned long) fid->id, (unsigned long) fid->generation);
-        obj = lmv_grab_obj(obd, fid, 0);
+        rc = lmv_check_connect(obd);
+       if (rc)
+               RETURN(rc);
+repeat:
+        LASSERT(++loop <= 2);
+        obj = lmv_grab_obj(obd, fid);
         if (obj) {
                 /* directory is splitted. look for right mds for this name */
-                mds = raw_name2idx(obj->objcount, filename, namelen - 1);
+                mds = raw_name2idx(obj->hashtype, obj->objcount, filename, namelen - 1);
                 rfid = obj->objs[mds].fid;
                 lmv_put_obj(obj);
         }
-        rc = md_getattr_name(lmv->tgts[mds].exp, &rfid, filename, namelen,
-                                  valid, ea_size, request);
+        
+        CDEBUG(D_OTHER, "getattr_name for %*s on %lu/%lu/%lu -> %lu/%lu/%lu\n",
+               namelen, filename, (unsigned long)fid->mds,
+               (unsigned long)fid->id, (unsigned long)fid->generation,
+               (unsigned long)rfid.mds, (unsigned long)rfid.id,
+               (unsigned long)rfid.generation);
+
+        rc = md_getattr_name(lmv->tgts[rfid.mds].ltd_exp, &rfid, filename,
+                             namelen, valid, ea_size, request);
+        if (rc == 0) {
+                /* this could be cross-node reference. in this case all we have
+                 * right now is mds/ino/generation triple. we'd like to find
+                 * other attributes */
+                body = lustre_msg_buf((*request)->rq_repmsg, 0, sizeof(*body));
+                LASSERT(body != NULL);
+                if (body->valid & OBD_MD_MDS) {
+                        struct ptlrpc_request *req = NULL;
+                        rfid = body->fid1;
+                        CDEBUG(D_OTHER, "request attrs for %lu/%lu/%lu\n",
+                               (unsigned long) rfid.mds,
+                               (unsigned long) rfid.id,
+                               (unsigned long) rfid.generation);
+                        rc = md_getattr_name(lmv->tgts[rfid.mds].ltd_exp, &rfid,
+                                             NULL, 1, valid, ea_size, &req);
+                        ptlrpc_req_finished(*request);
+                        *request = req;
+                }
+        } else if (rc == -ERESTART) {
+                /* directory got splitted. time to update local object and
+                 * repeat the request with proper MDS */
+                rc = lmv_get_mea_and_update_object(exp, &rfid);
+                if (rc == 0) {
+                        ptlrpc_req_finished(*request);
+                        goto repeat;
+                }
+        }
         RETURN(rc);
 }
 
 
 /*
- * llite passes fid of an target inode in data->fid1 and
- * fid of directory in data->fid2
+ * llite passes fid of an target inode in data->fid1 and fid of directory in
+ * data->fid2
  */
 int lmv_link(struct obd_export *exp, struct mdc_op_data *data,
              struct ptlrpc_request **request)
@@ -609,30 +997,39 @@ int lmv_link(struct obd_export *exp, struct mdc_op_data *data,
         struct lmv_obj *obj;
         int rc;
         ENTRY;
-        lmv_connect(obd);
+        
+        rc = lmv_check_connect(obd);
+       if (rc)
+               RETURN(rc);
+
         if (data->namelen != 0) {
                 /* usual link request */
-                obj = lmv_grab_obj(obd, &data->fid1, 0);
+                obj = lmv_grab_obj(obd, &data->fid1);
                 if (obj) {
-                        rc = raw_name2idx(obj->objcount, data->name,
-                                         data->namelen);
+                        rc = raw_name2idx(obj->hashtype, obj->objcount, data->name,
+                                          data->namelen);
                         data->fid1 = obj->objs[rc].fid;
                         lmv_put_obj(obj);
                 }
-                CDEBUG(D_OTHER,"link %u/%u/%u:%*s to %u/%u/%u mds %d\n",
-                       (unsigned) data->fid2.mds, (unsigned) data->fid2.id,
-                       (unsigned) data->fid2.generation, data->namelen,
-                       data->name, (unsigned) data->fid1.mds,
-                       (unsigned) data->fid1.id,
-                       (unsigned) data->fid1.generation, data->fid1.mds);
+                
+                CDEBUG(D_OTHER,"link %lu/%lu/%lu:%*s to %lu/%lu/%lu mds %lu\n",
+                       (unsigned long)data->fid2.mds,
+                       (unsigned long)data->fid2.id,
+                       (unsigned long)data->fid2.generation,
+                       data->namelen, data->name,
+                       (unsigned long)data->fid1.mds,
+                       (unsigned long)data->fid1.id,
+                       (unsigned long)data->fid1.generation,
+                       (unsigned long)data->fid1.mds);
         } else {
                 /* request from MDS to acquire i_links for inode by fid1 */
-                CDEBUG(D_OTHER, "inc i_nlinks for %u/%u/%u\n",
-                       (unsigned) data->fid1.mds, (unsigned) data->fid1.id,
-                       (unsigned) data->fid1.generation);
+                CDEBUG(D_OTHER, "inc i_nlinks for %lu/%lu/%lu\n",
+                       (unsigned long)data->fid1.mds,
+                       (unsigned long)data->fid1.id,
+                       (unsigned long)data->fid1.generation);
         }
                         
-        rc = md_link(lmv->tgts[data->fid1.mds].exp, data, request);
+        rc = md_link(lmv->tgts[data->fid1.mds].ltd_exp, data, request);
         RETURN(rc);
 }
 
@@ -647,107 +1044,127 @@ int lmv_rename(struct obd_export *exp, struct mdc_op_data *data,
         ENTRY;
 
         CDEBUG(D_OTHER, "rename %*s in %lu/%lu/%lu to %*s in %lu/%lu/%lu\n",
-               oldlen, old, (unsigned long) data->fid1.mds,
-               (unsigned long) data->fid1.id,
-               (unsigned long) data->fid1.generation,
+               oldlen, old, (unsigned long)data->fid1.mds,
+               (unsigned long)data->fid1.id,
+               (unsigned long)data->fid1.generation,
                newlen, new, (unsigned long) data->fid2.mds,
                (unsigned long) data->fid2.id,
                (unsigned long) data->fid2.generation);
-
-        lmv_connect(obd);
+        
+        if (!fid_equal(&data->fid1, &data->fid2))
+                CWARN("cross-node rename %lu/%lu/%lu:%*s to %lu/%lu/%lu:%*s\n",
+                      (unsigned long)data->fid1.mds,
+                      (unsigned long)data->fid1.id,
+                      (unsigned long)data->fid1.generation, oldlen, old,
+                      (unsigned long)data->fid2.mds,
+                      (unsigned long)data->fid2.id,
+                      (unsigned long)data->fid2.generation, newlen, new);
+
+        rc = lmv_check_connect(obd);
+       if (rc)
+               RETURN(rc);
 
         if (oldlen == 0) {
-                /* MDS with old dir entry is asking another MDS
-                 * to create name there */
+                /* MDS with old dir entry is asking another MDS to create name
+                 * there */
                 CDEBUG(D_OTHER,
                        "create %*s(%d/%d) in %lu/%lu/%lu pointing to %lu/%lu/%lu\n",
                        newlen, new, oldlen, newlen,
-                       (unsigned long) data->fid2.mds,
-                       (unsigned long) data->fid2.id,
-                       (unsigned long) data->fid2.generation,
-                       (unsigned long) data->fid1.mds,
-                       (unsigned long) data->fid1.id,
-                       (unsigned long) data->fid1.generation);
+                       (unsigned long)data->fid2.mds,
+                       (unsigned long)data->fid2.id,
+                       (unsigned long)data->fid2.generation,
+                       (unsigned long)data->fid1.mds,
+                       (unsigned long)data->fid1.id,
+                       (unsigned long)data->fid1.generation);
                 mds = data->fid2.mds;
                 goto request;
         }
 
-        obj = lmv_grab_obj(obd, &data->fid1, 0);
+        obj = lmv_grab_obj(obd, &data->fid1);
         if (obj) {
-                /* directory is already splitted, so we have to forward
-                 * request to the right MDS */
-                mds = raw_name2idx(obj->objcount, old, oldlen);
+                /* directory is already splitted, so we have to forward request
+                 * to the right MDS */
+                mds = raw_name2idx(obj->hashtype, obj->objcount, (char *)old, oldlen);
                 data->fid1 = obj->objs[mds].fid;
                 CDEBUG(D_OTHER, "forward to MDS #%u (%lu/%lu/%lu)\n", mds,
-                       (unsigned long) obj->objs[mds].fid.mds,
-                       (unsigned long) obj->objs[mds].fid.id,
-                       (unsigned long) obj->objs[mds].fid.generation);
+                       (unsigned long)obj->objs[mds].fid.mds,
+                       (unsigned long)obj->objs[mds].fid.id,
+                       (unsigned long)obj->objs[mds].fid.generation);
+                lmv_put_obj(obj);
         }
-        lmv_put_obj(obj);
 
-        obj = lmv_grab_obj(obd, &data->fid2, 0);
+        obj = lmv_grab_obj(obd, &data->fid2);
         if (obj) {
-                /* directory is already splitted, so we have to forward
-                 * request to the right MDS */
-                mds = raw_name2idx(obj->objcount, new, newlen);
+                /* directory is already splitted, so we have to forward request
+                 * to the right MDS */
+                mds = raw_name2idx(obj->hashtype, obj->objcount, (char *)new, newlen);
                 data->fid2 = obj->objs[mds].fid;
                 CDEBUG(D_OTHER, "forward to MDS #%u (%lu/%lu/%lu)\n", mds,
-                       (unsigned long) obj->objs[mds].fid.mds,
-                       (unsigned long) obj->objs[mds].fid.id,
-                       (unsigned long) obj->objs[mds].fid.generation);
+                       (unsigned long)obj->objs[mds].fid.mds,
+                       (unsigned long)obj->objs[mds].fid.id,
+                       (unsigned long)obj->objs[mds].fid.generation);
+                lmv_put_obj(obj);
         }
-        lmv_put_obj(obj);
         
         mds = data->fid1.mds;
 
 request:
-        rc = md_rename(lmv->tgts[mds].exp, data, old, oldlen,
-                            new, newlen, request); 
+        rc = md_rename(lmv->tgts[mds].ltd_exp, data, old, oldlen,
+                       new, newlen, request); 
         RETURN(rc);
 }
 
 int lmv_setattr(struct obd_export *exp, struct mdc_op_data *data,
-                struct iattr *iattr, void *ea, int ealen, void *ea2, int ea2len,
-                struct ptlrpc_request **request)
+                struct iattr *iattr, void *ea, int ealen, void *ea2,
+                int ea2len, struct ptlrpc_request **request)
 {
         struct obd_device *obd = exp->exp_obd;
         struct lmv_obd *lmv = &obd->u.lmv;
-        int rc = 0, i = data->fid1.mds;
         struct ptlrpc_request *req;
-        struct mds_body *mds_body;
+        struct mds_body *body;
         struct lmv_obj *obj;
+        int rc = 0, i;
         ENTRY;
-        lmv_connect(obd);
-        obj = lmv_grab_obj(obd, &data->fid1, 0);
+
+        rc = lmv_check_connect(obd);
+       if (rc)
+               RETURN(rc);
+
+        obj = lmv_grab_obj(obd, &data->fid1);
+        
         CDEBUG(D_OTHER, "SETATTR for %lu/%lu/%lu, valid 0x%x%s\n",
-               (unsigned long) data->fid1.mds,
-               (unsigned long) data->fid1.id,
-               (unsigned long) data->fid1.generation, iattr->ia_valid,
+               (unsigned long)data->fid1.mds, (unsigned long)data->fid1.id,
+               (unsigned long)data->fid1.generation, iattr->ia_valid,
                obj ? ", splitted" : "");
+        
         if (obj) {
                 for (i = 0; i < obj->objcount; i++) {
                         data->fid1 = obj->objs[i].fid;
-                        rc = md_setattr(lmv->tgts[i].exp, data, iattr, ea,
-                                        ealen, ea2, ea2len, &req);
-                        LASSERT(rc == 0);
+                        
+                        rc = md_setattr(lmv->tgts[data->fid1.mds].ltd_exp, data,
+                                        iattr, ea, ealen, ea2, ea2len, &req);
+
                         if (fid_equal(&obj->fid, &obj->objs[i].fid)) {
-                                /* this is master object and this request
-                                 * should be returned back to llite */
+                                /* this is master object and this request should
+                                 * be returned back to llite */
                                 *request = req;
                         } else {
                                 ptlrpc_req_finished(req);
                         }
+
+                        if (rc)
+                                break;
                 }
                 lmv_put_obj(obj);
         } else {
-                LASSERT(data->fid1.mds < lmv->count);
-                rc = md_setattr(lmv->tgts[i].exp, data, iattr, ea, ealen,
-                                ea2, ea2len, request); 
+                LASSERT(data->fid1.mds < lmv->desc.ld_tgt_count);
+                rc = md_setattr(lmv->tgts[data->fid1.mds].ltd_exp, data,
+                                iattr, ea, ealen, ea2, ea2len, request); 
                 if (rc == 0) {
-                        mds_body = lustre_msg_buf((*request)->rq_repmsg, 0,
-                                        sizeof(*mds_body));
-                        LASSERT(mds_body != NULL);
-                        LASSERT(mds_body->mds == i);
+                        body = lustre_msg_buf((*request)->rq_repmsg, 0,
+                                              sizeof(*body));
+                        LASSERT(body != NULL);
+                        LASSERT(body->mds == data->fid1.mds);
                 }
         }
         RETURN(rc);
@@ -760,13 +1177,17 @@ int lmv_sync(struct obd_export *exp, struct ll_fid *fid,
         struct lmv_obd *lmv = &obd->u.lmv;
         int rc;
         ENTRY;
-        lmv_connect(obd);
-        rc = md_sync(lmv->tgts[0].exp, fid, request); 
+
+        rc = lmv_check_connect(obd);
+       if (rc)
+               RETURN(rc);
+
+        rc = md_sync(lmv->tgts[fid->mds].ltd_exp, fid, request); 
         RETURN(rc);
 }
 
-int lmv_dirobj_blocking_ast(struct ldlm_lock *lock,
-                            struct ldlm_lock_desc *desc, void *data, int flag)
+int lmv_dirobj_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
+                            void *data, int flag)
 {
         struct lustre_handle lockh;
         struct lmv_obj *obj;
@@ -785,17 +1206,15 @@ int lmv_dirobj_blocking_ast(struct ldlm_lock *lock,
         case LDLM_CB_CANCELING:
                 /* time to drop cached attrs for dirobj */
                 obj = lock->l_ast_data;
-                if (!obj)
-                        break;
-
-                CDEBUG(D_OTHER, "cancel %s on %lu/%lu, master %lu/%lu/%lu\n",
-                       lock->l_resource->lr_name.name[3] == 1 ?
-                                "LOOKUP" : "UPDATE",
-                       (unsigned long) lock->l_resource->lr_name.name[0],
-                       (unsigned long) lock->l_resource->lr_name.name[1],
-                       (unsigned long) obj->fid.mds,
-                       (unsigned long) obj->fid.id,
-                       (unsigned long) obj->fid.generation);
+                if (obj) {
+                        CDEBUG(D_OTHER, "cancel %s on %lu/%lu, master %lu/%lu/%lu\n",
+                               lock->l_resource->lr_name.name[3] == 1 ? "LOOKUP" : "UPDATE",
+                               (unsigned long)lock->l_resource->lr_name.name[0],
+                               (unsigned long)lock->l_resource->lr_name.name[1],
+                               (unsigned long)obj->fid.mds, (unsigned long)obj->fid.id,
+                               (unsigned long)obj->fid.generation);
+                        lmv_put_obj(obj);
+                }
                 break;
         default:
                 LBUG();
@@ -830,43 +1249,96 @@ int lmv_readpage(struct obd_export *exp, struct ll_fid *mdc_fid,
         struct lmv_obj *obj;
         int rc, i;
         ENTRY;
-        lmv_connect(obd);
-       
-        LASSERT(mdc_fid->mds < lmv->count);
+
+        rc = lmv_check_connect(obd);
+       if (rc)
+               RETURN(rc);
+
+        LASSERT(mdc_fid->mds < lmv->desc.ld_tgt_count);
         CDEBUG(D_OTHER, "READPAGE at %llu from %lu/%lu/%lu\n",
                offset, (unsigned long) rfid.mds,
                (unsigned long) rfid.id,
                (unsigned long) rfid.generation);
 
-        obj = lmv_grab_obj(obd, mdc_fid, 0);
+        obj = lmv_grab_obj(obd, mdc_fid);
         if (obj) {
-                /* find dirobj containing page with requested offset */
-                /* FIXME: what about protecting cached attrs here? */
+                lmv_lock_obj(obj);
+
+                /* find dirobj containing page with requested offset. */
                 for (i = 0; i < obj->objcount; i++) {
                         if (offset < obj->objs[i].size)
                                 break;
                         offset -= obj->objs[i].size;
                 }
                 rfid = obj->objs[i].fid;
+                
+                lmv_unlock_obj(obj);
+                lmv_put_obj(obj);
+                
                 CDEBUG(D_OTHER, "forward to %lu/%lu/%lu with offset %lu\n",
-                       (unsigned long) rfid.mds,
-                       (unsigned long) rfid.id,
-                       (unsigned long) rfid.generation,
-                       (unsigned long) offset);
+                       (unsigned long)rfid.mds, (unsigned long)rfid.id,
+                       (unsigned long)rfid.generation, (unsigned long)offset);
         }
-        rc = md_readpage(lmv->tgts[rfid.mds].exp, &rfid, offset, page, request);
-        if (rc == 0 && !fid_equal(&rfid, mdc_fid)) {
-                /* this page isn't from master object. to avoid
-                 * ./.. duplication in directory, we have to remove them
-                 * from all slave objects */
+        rc = md_readpage(lmv->tgts[rfid.mds].ltd_exp, &rfid, offset,
+                         page, request);
+        
+        if (rc == 0 && !fid_equal(&rfid, mdc_fid))
+                /* this page isn't from master object. To avoid "." and ".." 
+                 * duplication in directory, we have to remove them from all
+                 * slave objects */
                 lmv_remove_dots(page);
-        }
-      
-        lmv_put_obj(obj);
+        
+        RETURN(rc);
+}
+
+int lmv_unlink_slaves(struct obd_export *exp, struct mdc_op_data *data,
+                      struct ptlrpc_request **req)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mea *mea = data->mea1;
+        struct mdc_op_data data2;
+        int i, rc = 0, mds;
+        ENTRY;
+
+        LASSERT(mea != NULL);
+        for (i = 0; i < mea->mea_count; i++) {
+                memset(&data2, 0, sizeof(data2));
+                data2.fid1 = mea->mea_fids[i];
+                data2.create_mode = MDS_MODE_DONT_LOCK | S_IFDIR;
+                mds = data2.fid1.mds;
 
+                if (lmv->tgts[mds].ltd_exp == NULL)
+                        continue;
+
+                rc = md_unlink(lmv->tgts[mds].ltd_exp, &data2, req);
+                CDEBUG(D_OTHER, "unlink slave %lu/%lu/%lu -> %d\n",
+                       (unsigned long) mea->mea_fids[i].mds,
+                       (unsigned long) mea->mea_fids[i].id,
+                       (unsigned long) mea->mea_fids[i].generation, rc);
+                if (*req) {
+                        ptlrpc_req_finished(*req);
+                        *req = NULL;
+                }
+                if (rc)
+                        break;
+        }
         RETURN(rc);
 }
 
+int lmv_delete_object(struct obd_export *exp, struct ll_fid *fid)
+{
+        ENTRY;
+
+        if (!lmv_delete_obj(exp, fid)) {
+                CDEBUG(D_OTHER, "Object %lu/%lu/%lu is not found.\n",
+                       (unsigned long)fid->mds, (unsigned long)fid->id,
+                       (unsigned long)fid->generation);
+        }
+        
+        RETURN(0);
+}
+
 int lmv_unlink(struct obd_export *exp, struct mdc_op_data *data,
                struct ptlrpc_request **request)
 {
@@ -874,12 +1346,21 @@ int lmv_unlink(struct obd_export *exp, struct mdc_op_data *data,
         struct lmv_obd *lmv = &obd->u.lmv;
         int rc, i = 0;
         ENTRY;
-        lmv_connect(obd);
-        if (data->namelen != 0) {
+        
+       rc = lmv_check_connect(obd);
+       if (rc)
+               RETURN(rc);
+
+        if (data->namelen == 0 && data->mea1 != NULL) {
+                /* mds asks to remove slave objects */
+                rc = lmv_unlink_slaves(exp, data, request);
+                RETURN(rc);
+        } else if (data->namelen != 0) {
                 struct lmv_obj *obj;
-                obj = lmv_grab_obj(obd, &data->fid1, 0);
+                
+                obj = lmv_grab_obj(obd, &data->fid1);
                 if (obj) {
-                        i = raw_name2idx(obj->objcount, data->name,
+                        i = raw_name2idx(obj->hashtype, obj->objcount, data->name,
                                          data->namelen);
                         data->fid1 = obj->objs[i].fid;
                         lmv_put_obj(obj);
@@ -895,18 +1376,23 @@ int lmv_unlink(struct obd_export *exp, struct mdc_op_data *data,
                        (unsigned long) data->fid1.id,
                        (unsigned long) data->fid1.generation);
         }
-        rc = md_unlink(lmv->tgts[data->fid1.mds].exp, data, request); 
+        rc = md_unlink(lmv->tgts[data->fid1.mds].ltd_exp, data, request); 
         RETURN(rc);
 }
 
 struct obd_device *lmv_get_real_obd(struct obd_export *exp,
-                                        char *name, int len)
+                                    char *name, int len)
 {
         struct obd_device *obd = exp->exp_obd;
         struct lmv_obd *lmv = &obd->u.lmv;
+        int rc;
         ENTRY;
-        lmv_connect(obd);
-        obd = lmv->tgts[0].exp->exp_obd;
+
+        rc = lmv_check_connect(obd);
+       if (rc)
+               RETURN(ERR_PTR(rc));
+#warning "we need well-desgined readdir() implementation to remove this mess"
+        obd = lmv->tgts[0].ltd_exp->exp_obd;
         EXIT;
         return obd;
 }
@@ -932,9 +1418,19 @@ int lmv_init_ea_size(struct obd_export *exp, int easize, int cookiesize)
         if (lmv->connected == 0)
                 RETURN(0);
 
-        /* FIXME: error handling? */
-        for (i = 0; i < lmv->count; i++)
-                rc = obd_init_ea_size(lmv->tgts[i].exp, easize, cookiesize);
+        for (i = 0; i < lmv->desc.ld_tgt_count; i++) {
+                if (lmv->tgts[i].ltd_exp == NULL) {
+                        CWARN("%s: NULL export for %d\n", obd->obd_name, i);
+                        continue;
+                }
+
+                rc = obd_init_ea_size(lmv->tgts[i].ltd_exp, easize, cookiesize);
+                if (rc) {
+                        CERROR("obd_init_ea_size() failed on MDT target %d, "
+                               "error %d.\n", i, rc);
+                        break;
+                }
+        }
         RETURN(rc);
 }
 
@@ -947,13 +1443,15 @@ int lmv_obd_create_single(struct obd_export *exp, struct obdo *oa,
         struct lov_stripe_md *obj_mdp = &obj_md;
         int rc = 0;
         ENTRY;
-        lmv_connect(obd);
+
+        rc = lmv_check_connect(obd);
+       if (rc)
+               RETURN(rc);
 
         LASSERT(ea == NULL);
-        LASSERT(oa->o_mds < lmv->count);
+        LASSERT(oa->o_mds < lmv->desc.ld_tgt_count);
 
-        rc = obd_create(lmv->tgts[oa->o_mds].exp, oa, &obj_mdp, oti);
-        LASSERT(rc == 0);
+        rc = obd_create(lmv->tgts[oa->o_mds].ltd_exp, oa, &obj_mdp, oti);
 
         RETURN(rc);
 }
@@ -962,15 +1460,19 @@ int lmv_obd_create_single(struct obd_export *exp, struct obdo *oa,
  * to be called from MDS only
  */
 int lmv_obd_create(struct obd_export *exp, struct obdo *oa,
-               struct lov_stripe_md **ea, struct obd_trans_info *oti)
+                   struct lov_stripe_md **ea, struct obd_trans_info *oti)
 {
         struct obd_device *obd = exp->exp_obd;
         struct lmv_obd *lmv = &obd->u.lmv;
-        struct mea *mea;
         int i, c, rc = 0;
+        struct mea *mea;
         struct ll_fid mfid;
+        int lcount;
         ENTRY;
-        lmv_connect(obd);
+
+        rc = lmv_check_connect(obd);
+        if (rc)
+                RETURN(rc);
 
         LASSERT(oa != NULL);
         
@@ -980,25 +1482,33 @@ int lmv_obd_create(struct obd_export *exp, struct obdo *oa,
         }
 
         if (*ea == NULL) {
-                rc = obd_alloc_diskmd(exp, (struct lov_mds_md **) ea);
-                LASSERT(*ea != NULL);
+                rc = obd_alloc_diskmd(exp, (struct lov_mds_md **)ea);
+                if (rc < 0) {
+                        CERROR("obd_alloc_diskmd() failed, error %d\n",
+                               rc);
+                        RETURN(rc);
+                }
+                
+                if (*ea == NULL)
+                        RETURN(-EINVAL);
         }
 
-        mea = (struct mea *) *ea;
+        rc = 0;
         mfid.id = oa->o_id;
         mfid.generation = oa->o_generation;
-        rc = 0;
-        if (!mea->mea_count || mea->mea_count > lmv->count)
-                mea->mea_count = lmv->count;
+        
+        mea = (struct mea *)*ea;
+        if (!mea->mea_count || mea->mea_count > lmv->desc.ld_tgt_count)
+                mea->mea_count = lmv->desc.ld_tgt_count;
+        mea->mea_magic = MEA_MAGIC_ALL_CHARS;
 
         mea->mea_master = -1;
-        
-        /* FIXME: error handling? */
-        for (i = 0, c = 0; c < mea->mea_count && i < lmv->count; i++) {
+        lcount = lmv->desc.ld_tgt_count;
+        for (i = 0, c = 0; c < mea->mea_count && i < lcount; i++) {
                 struct lov_stripe_md obj_md;
                 struct lov_stripe_md *obj_mdp = &obj_md;
                
-                if (lmv->tgts[i].exp == NULL) {
+                if (lmv->tgts[i].ltd_exp == NULL) {
                         /* this is master MDS */
                         mea->mea_fids[c].id = mfid.id;
                         mea->mea_fids[c].generation = mfid.generation;
@@ -1008,17 +1518,20 @@ int lmv_obd_create(struct obd_export *exp, struct obdo *oa,
                         continue;
                 }
 
-                /* "Master" MDS should always be part of stripped dir, so
-                   scan for it */
+                /* "master" MDS should always be part of stripped dir, so scan
+                   for it. */
                 if (mea->mea_master == -1 && c == mea->mea_count - 1)
                         continue;
 
                 oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLTYPE | OBD_MD_FLMODE
-                                | OBD_MD_FLUID | OBD_MD_FLGID;
+                        | OBD_MD_FLUID | OBD_MD_FLGID | OBD_MD_FLID;
 
-                rc = obd_create(lmv->tgts[c].exp, oa, &obj_mdp, oti);
-                /* FIXME: error handling here */
-                LASSERT(rc == 0);
+                rc = obd_create(lmv->tgts[c].ltd_exp, oa, &obj_mdp, oti);
+                if (rc) {
+                        CERROR("obd_create() failed on MDT target %d, "
+                               "error %d\n", c, rc);
+                        RETURN(rc);
+                }
 
                 mea->mea_fids[c].id = oa->o_id;
                 mea->mea_fids[c].generation = oa->o_generation;
@@ -1034,7 +1547,7 @@ int lmv_obd_create(struct obd_export *exp, struct obdo *oa,
 }
 
 static int lmv_get_info(struct obd_export *exp, __u32 keylen,
-                           void *key, __u32 *vallen, void *val)
+                        void *key, __u32 *vallen, void *val)
 {
         struct obd_device *obd;
         struct lmv_obd *lmv;
@@ -1051,7 +1564,7 @@ static int lmv_get_info(struct obd_export *exp, __u32 keylen,
         if (keylen == 6 && memcmp(key, "mdsize", 6) == 0) {
                 __u32 *mdsize = val;
                 *vallen = sizeof(__u32);
-                *mdsize = sizeof(struct ll_fid) * lmv->count
+                *mdsize = sizeof(struct ll_fid) * lmv->desc.ld_tgt_count
                                 + sizeof(struct mea);
                 RETURN(0);
         } else if (keylen == 6 && memcmp(key, "mdsnum", 6) == 0) {
@@ -1060,7 +1573,7 @@ static int lmv_get_info(struct obd_export *exp, __u32 keylen,
                 __u32 *mdsnum = val;
                 int i;
 
-                for (i = 0, tgts = lmv->tgts; i < lmv->count; i++, tgts++) {
+                for (i = 0, tgts = lmv->tgts; i < lmv->desc.ld_tgt_count; i++, tgts++) {
                         if (obd_uuid_equals(&tgts->uuid, cluuid)) {
                                 *vallen = sizeof(__u32);
                                 *mdsnum = i;
@@ -1088,17 +1601,10 @@ int lmv_set_info(struct obd_export *exp, obd_count keylen,
                 RETURN(-EINVAL);
         }
         lmv = &obd->u.lmv;
-        lmv_connect(obd);
-
-        if (keylen >= strlen("client") && strcmp(key, "client") == 0) {
-                struct lmv_tgt_desc *tgts;
-                int i, rc;
 
-                for (i = 0, tgts = lmv->tgts; i < lmv->count; i++, tgts++) {
-                        rc = obd_set_info(tgts->exp, keylen, key, vallen, val);
-                        if (rc)
-                                RETURN(rc);
-                }
+        if (keylen >= strlen("inter_mds") && strcmp(key, "inter_mds") == 0) {
+                lmv->server_timeout = 1;
+                lmv_set_timeouts(obd);
                 RETURN(0);
         }
         
@@ -1112,9 +1618,9 @@ int lmv_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
         struct lmv_obd *lmv = &obd->u.lmv;
         int mea_size;
         ENTRY;
-        lmv_connect(obd);
 
-       mea_size = sizeof(struct ll_fid) * lmv->count + sizeof(struct mea);
+       mea_size = sizeof(struct ll_fid) * 
+                lmv->desc.ld_tgt_count + sizeof(struct mea);
         if (!lmmp)
                 RETURN(mea_size);
 
@@ -1124,9 +1630,9 @@ int lmv_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
                 RETURN(0);
         }
 
-        if (!*lmmp) {
+        if (*lmmp == NULL) {
                 OBD_ALLOC(*lmmp, mea_size);
-                if (!*lmmp)
+                if (*lmmp == NULL)
                         RETURN(-ENOMEM);
         }
 
@@ -1139,7 +1645,7 @@ int lmv_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
 }
 
 int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **mem_tgt,
-                        struct lov_mds_md *disk_src, int mdsize)
+                 struct lov_mds_md *disk_src, int mdsize)
 {
         struct obd_device *obd = class_exp2obd(exp);
         struct lmv_obd *lmv = &obd->u.lmv;
@@ -1147,9 +1653,9 @@ int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **mem_tgt,
         struct mea *mea = (void *) disk_src;
         int mea_size;
         ENTRY;
-        lmv_connect(obd);
 
-       mea_size = sizeof(struct ll_fid) * lmv->count + sizeof(struct mea);
+       mea_size = sizeof(struct ll_fid) * 
+                lmv->desc.ld_tgt_count + sizeof(struct mea);
         if (mem_tgt == NULL)
                 return mea_size;
 
@@ -1161,8 +1667,8 @@ int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **mem_tgt,
         LASSERT(mea_size == mdsize);
 
         OBD_ALLOC(*tmea, mea_size);
-        /* FIXME: error handling here */
-        LASSERT(*tmea != NULL);
+        if (*tmea == NULL)
+                RETURN(-ENOMEM);
 
         if (!disk_src)
                 RETURN(mea_size);
@@ -1173,8 +1679,8 @@ int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **mem_tgt,
 }
 
 int lmv_brw(int rw, struct obd_export *exp, struct obdo *oa,
-                struct lov_stripe_md *ea, obd_count oa_bufs,
-                struct brw_page *pgarr, struct obd_trans_info *oti)
+            struct lov_stripe_md *ea, obd_count oa_bufs,
+            struct brw_page *pgarr, struct obd_trans_info *oti)
 {
         struct obd_device *obd = exp->exp_obd;
         struct lmv_obd *lmv = &obd->u.lmv;
@@ -1184,61 +1690,58 @@ int lmv_brw(int rw, struct obd_export *exp, struct obdo *oa,
         LASSERT(oa != NULL);
         LASSERT(ea != NULL);
         LASSERT(pgarr != NULL);
-        LASSERT(oa->o_mds < lmv->count);
+        LASSERT(oa->o_mds < lmv->desc.ld_tgt_count);
 
         oa->o_gr = mea->mea_fids[oa->o_mds].generation;
         oa->o_id = mea->mea_fids[oa->o_mds].id;
         oa->o_valid =  OBD_MD_FLID | OBD_MD_FLGROUP;
-        err = obd_brw(rw, lmv->tgts[oa->o_mds].exp, oa,
-                        NULL, oa_bufs, pgarr, oti);
+        err = obd_brw(rw, lmv->tgts[oa->o_mds].ltd_exp, oa,
+                      NULL, oa_bufs, pgarr, oti);
         RETURN(err);
 }
 
 struct obd_ops lmv_obd_ops = {
-        o_owner:                THIS_MODULE,
-        o_attach:               lmv_attach,
-        o_detach:               lmv_detach,
-        o_setup:                lmv_setup,
-        o_cleanup:              lmv_cleanup,
-        o_connect:              lmv_connect_fake,
-        o_disconnect:           lmv_disconnect,
-        o_statfs:               lmv_statfs,
-        o_get_info:             lmv_get_info,
-        o_set_info:             lmv_set_info,
-        o_create:               lmv_obd_create,
-        o_packmd:               lmv_packmd,
-        o_unpackmd:             lmv_unpackmd,
-        o_brw:                  lmv_brw,
-        o_init_ea_size:         lmv_init_ea_size,
+        .o_owner                = THIS_MODULE,
+        .o_attach               = lmv_attach,
+        .o_detach               = lmv_detach,
+        .o_setup                = lmv_setup,
+        .o_cleanup              = lmv_cleanup,
+        .o_connect              = lmv_connect,
+        .o_disconnect           = lmv_disconnect,
+        .o_statfs               = lmv_statfs,
+        .o_get_info             = lmv_get_info,
+        .o_set_info             = lmv_set_info,
+        .o_create               = lmv_obd_create,
+        .o_packmd               = lmv_packmd,
+        .o_unpackmd             = lmv_unpackmd,
+        .o_brw                  = lmv_brw,
+        .o_init_ea_size         = lmv_init_ea_size,
+        .o_notify               = lmv_notify,
+        .o_iocontrol            = lmv_iocontrol,
 };
 
 struct md_ops lmv_md_ops = {
-        m_getstatus:            lmv_getstatus,
-        m_getattr:              lmv_getattr,
-        m_change_cbdata:        lmv_change_cbdata,
-        m_change_cbdata_name:   lmv_change_cbdata_name,
-        m_close:                lmv_close,
-        m_create:               lmv_create,
-        m_done_writing:         lmv_done_writing,
-        m_enqueue:              lmv_enqueue,
-        m_getattr_name:         lmv_getattr_name,
-        m_intent_lock:          lmv_intent_lock,
-        m_link:                 lmv_link,
-        m_rename:               lmv_rename,
-        m_setattr:              lmv_setattr,
-        m_sync:                 lmv_sync,
-        m_readpage:             lmv_readpage,
-        m_unlink:               lmv_unlink,
-        m_get_real_obd:         lmv_get_real_obd,
-        m_valid_attrs:          lmv_valid_attrs,
+        .m_getstatus            = lmv_getstatus,
+        .m_getattr              = lmv_getattr,
+        .m_change_cbdata        = lmv_change_cbdata,
+        .m_change_cbdata_name   = lmv_change_cbdata_name,
+        .m_close                = lmv_close,
+        .m_create               = lmv_create,
+        .m_done_writing         = lmv_done_writing,
+        .m_enqueue              = lmv_enqueue,
+        .m_getattr_name         = lmv_getattr_name,
+        .m_intent_lock          = lmv_intent_lock,
+        .m_link                 = lmv_link,
+        .m_rename               = lmv_rename,
+        .m_setattr              = lmv_setattr,
+        .m_sync                 = lmv_sync,
+        .m_readpage             = lmv_readpage,
+        .m_unlink               = lmv_unlink,
+        .m_get_real_obd         = lmv_get_real_obd,
+        .m_valid_attrs          = lmv_valid_attrs,
+        .m_delete_object        = lmv_delete_object,
 };
 
-//#ifndef LPROCFS
-static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
-static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
-//#else
-LPROCFS_INIT_VARS(lmv, lprocfs_module_vars, lprocfs_obd_vars)
-
 int __init lmv_init(void)
 {
         struct lprocfs_static_vars lvars;
@@ -1250,12 +1753,12 @@ int __init lmv_init(void)
         RETURN(rc);
 }
 
+#ifdef __KERNEL__
 static void lmv_exit(void)
 {
         class_unregister_type(OBD_LMV_DEVICENAME);
 }
 
-#ifdef __KERNEL__
 MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre Logical Metadata Volume OBD driver");
 MODULE_LICENSE("GPL");
@@ -1263,4 +1766,3 @@ MODULE_LICENSE("GPL");
 module_init(lmv_init);
 module_exit(lmv_exit);
 #endif
-