Whamcloud - gitweb
b=18690 Enable rehashing and increase max hash table sizes.
[fs/lustre-release.git] / lustre / lov / lov_obd.c
index 8774a94..135458d 100644 (file)
@@ -1,25 +1,44 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Copyright (C) 2002, 2003 Cluster File Systems, Inc.
- * Author: Phil Schwan <phil@clusterfs.com>
- *         Peter Braam <braam@clusterfs.com>
- *         Mike Shaver <shaver@clusterfs.com>
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * 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.
+ *
+ * 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).
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * 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
  *
- *   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.
+ * 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.
  *
- *   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.
+ * GPL HEADER END
+ */
+/*
+ * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  *
- *   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.
+ * lustre/lov/lov_obd.c
+ *
+ * Author: Phil Schwan <phil@clusterfs.com>
+ * Author: Peter Braam <braam@clusterfs.com>
+ * Author: Mike Shaver <shaver@clusterfs.com>
+ * Author: Nathan Rutman <nathan@clusterfs.com>
  */
 
 #ifndef EXPORT_SYMTAB
 #endif
 #define DEBUG_SUBSYSTEM S_LOV
 #ifdef __KERNEL__
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/pagemap.h>
-#include <linux/seq_file.h>
-#include <asm/div64.h>
+#include <libcfs/libcfs.h>
 #else
 #include <liblustre.h>
 #endif
 
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_net.h>
-#include <linux/lustre_idl.h>
-#include <linux/lustre_dlm.h>
-#include <linux/lustre_mds.h>
-#include <linux/obd_class.h>
-#include <linux/obd_lov.h>
-#include <linux/obd_ost.h>
-#include <linux/lprocfs_status.h>
-#include <linux/lustre_audit.h>
+#include <obd_support.h>
+#include <lustre_lib.h>
+#include <lustre_net.h>
+#include <lustre/lustre_idl.h>
+#include <lustre_dlm.h>
+#include <lustre_mds.h>
+#include <lustre_debug.h>
+#include <obd_class.h>
+#include <obd_lov.h>
+#include <obd_ost.h>
+#include <lprocfs_status.h>
+#include <lustre_param.h>
+#include <cl_object.h>
+#include <lustre/ll_fiemap.h>
+
 #include "lov_internal.h"
 
-/* obd methods */
+/* Keep a refcount of lov->tgt usage to prevent racing with addition/deletion.
+   Any function that expects lov_tgts to remain stationary must take a ref. */
+static void lov_getref(struct obd_device *obd)
+{
+        struct lov_obd *lov = &obd->u.lov;
+
+        /* nobody gets through here until lov_putref is done */
+        cfs_mutex_down(&lov->lov_lock);
+        cfs_atomic_inc(&lov->lov_refcount);
+        cfs_mutex_up(&lov->lov_lock);
+        return;
+}
+
+static void __lov_del_obd(struct obd_device *obd, struct lov_tgt_desc *tgt);
+
+static void lov_putref(struct obd_device *obd)
+{
+        struct lov_obd *lov = &obd->u.lov;
+
+        cfs_mutex_down(&lov->lov_lock);
+        /* ok to dec to 0 more than once -- ltd_exp's will be null */
+        if (cfs_atomic_dec_and_test(&lov->lov_refcount) && lov->lov_death_row) {
+                CFS_LIST_HEAD(kill);
+                int i;
+                struct lov_tgt_desc *tgt, *n;
+                CDEBUG(D_CONFIG, "destroying %d lov targets\n",
+                       lov->lov_death_row);
+                for (i = 0; i < lov->desc.ld_tgt_count; i++) {
+                        tgt = lov->lov_tgts[i];
+
+                        if (!tgt || !tgt->ltd_reap)
+                                continue;
+                        cfs_list_add(&tgt->ltd_kill, &kill);
+                        /* XXX - right now there is a dependency on ld_tgt_count
+                         * being the maximum tgt index for computing the
+                         * mds_max_easize. So we can't shrink it. */
+                        lov_ost_pool_remove(&lov->lov_packed, i);
+                        lov->lov_tgts[i] = NULL;
+                        lov->lov_death_row--;
+                }
+                cfs_mutex_up(&lov->lov_lock);
+
+                cfs_list_for_each_entry_safe(tgt, n, &kill, ltd_kill) {
+                        cfs_list_del(&tgt->ltd_kill);
+                        /* Disconnect */
+                        __lov_del_obd(obd, tgt);
+                }
+        } else {
+                cfs_mutex_up(&lov->lov_lock);
+        }
+}
+
+static int lov_set_osc_active(struct obd_device *obd, struct obd_uuid *uuid,
+                              int activate);
+static int lov_notify(struct obd_device *obd, struct obd_device *watched,
+                      enum obd_notify_event ev, void *data);
+
+
 #define MAX_STRING_SIZE 128
-static int lov_connect_obd(struct obd_device *obd, struct lov_tgt_desc *tgt,
-                           int activate, struct obd_connect_data *conn_data,
-                           unsigned long connect_flags)
+int lov_connect_obd(struct obd_device *obd, __u32 index, int activate,
+                    struct obd_connect_data *data)
 {
-        struct obd_uuid lov_osc_uuid = { "LOV_OSC_UUID" };
-        struct obd_uuid *tgt_uuid = &tgt->uuid;
+        struct lov_obd *lov = &obd->u.lov;
+        struct obd_uuid tgt_uuid;
+        struct obd_device *tgt_obd;
+        static struct obd_uuid lov_osc_uuid = { "LOV_OSC_UUID" };
+        struct obd_import *imp;
 
 #ifdef __KERNEL__
-        struct proc_dir_entry *lov_proc_dir;
+        cfs_proc_dir_entry_t *lov_proc_dir;
 #endif
-        struct lov_obd *lov = &obd->u.lov;
-        struct lustre_handle conn = {0, };
-        struct obd_device *tgt_obd;
         int rc;
         ENTRY;
 
-        tgt_obd = class_find_client_obd(tgt_uuid, OBD_OSC_DEVICENAME,
-                                        &obd->obd_uuid);
-
-        if (!tgt_obd) {
-                CERROR("Target %s not attached\n", tgt_uuid->uuid);
+        if (!lov->lov_tgts[index])
                 RETURN(-EINVAL);
-        }
+
+        tgt_uuid = lov->lov_tgts[index]->ltd_uuid;
+        tgt_obd = lov->lov_tgts[index]->ltd_obd;
 
         if (!tgt_obd->obd_set_up) {
-                CERROR("Target %s not set up\n", tgt_uuid->uuid);
+                CERROR("Target %s not set up\n", obd_uuid2str(&tgt_uuid));
                 RETURN(-EINVAL);
         }
 
+        /* override the sp_me from lov */
+        tgt_obd->u.cli.cl_sp_me = lov->lov_sp_me;
+
+        if (data && (data->ocd_connect_flags & OBD_CONNECT_INDEX))
+                data->ocd_index = index;
+
+        /*
+         * Divine LOV knows that OBDs under it are OSCs.
+         */
+        imp = tgt_obd->u.cli.cl_import;
+
         if (activate) {
                 tgt_obd->obd_no_recov = 0;
-                ptlrpc_activate_import(tgt_obd->u.cli.cl_import);
+                /* FIXME this is probably supposed to be
+                   ptlrpc_set_import_active.  Horrible naming. */
+                ptlrpc_activate_import(imp);
+        }
+
+        rc = obd_register_observer(tgt_obd, obd);
+        if (rc) {
+                CERROR("Target %s register_observer error %d\n",
+                       obd_uuid2str(&tgt_uuid), rc);
+                RETURN(rc);
         }
 
-        if (tgt_obd->u.cli.cl_import->imp_invalid) {
+
+        if (imp->imp_invalid) {
                 CERROR("not connecting OSC %s; administratively "
-                       "disabled\n", tgt_uuid->uuid);
-                rc = obd_register_observer(tgt_obd, obd);
-                if (rc) {
-                        CERROR("Target %s register_observer error %d; "
-                               "will not be able to reactivate\n",
-                               tgt_uuid->uuid, rc);
-                }
+                       "disabled\n", obd_uuid2str(&tgt_uuid));
                 RETURN(0);
         }
 
-        rc = obd_connect(&conn, tgt_obd, &lov_osc_uuid, conn_data,
-                         connect_flags);
-        if (rc) {
-                CERROR("Target %s connect error %d\n", tgt_uuid->uuid, rc);
-                RETURN(rc);
+        rc = obd_connect(NULL, &lov->lov_tgts[index]->ltd_exp, tgt_obd,
+                         &lov_osc_uuid, data, NULL);
+        if (rc || !lov->lov_tgts[index]->ltd_exp) {
+                CERROR("Target %s connect error %d\n",
+                       obd_uuid2str(&tgt_uuid), rc);
+                RETURN(-ENODEV);
         }
-        tgt->ltd_exp = class_conn2export(&conn);
 
-        rc = obd_register_observer(tgt_obd, obd);
-        if (rc) {
-                CERROR("Target %s register_observer error %d\n",
-                       tgt_uuid->uuid, rc);
-                obd_disconnect(tgt->ltd_exp, 0);
-                tgt->ltd_exp = NULL;
-                RETURN(rc);
-        }
+        lov->lov_tgts[index]->ltd_reap = 0;
 
-        lov_tgt_set_flags(lov, tgt, LTD_ACTIVE);
+        CDEBUG(D_CONFIG, "Connected tgt idx %d %s (%s) %sactive\n", index,
+               obd_uuid2str(&tgt_uuid), tgt_obd->obd_name, activate ? "":"in");
 
 #ifdef __KERNEL__
         lov_proc_dir = lprocfs_srch(obd->obd_proc_entry, "target_obds");
         if (lov_proc_dir) {
-                struct obd_device *osc_obd = class_conn2obd(&conn);
-                struct proc_dir_entry *osc_symlink;
-                char name[MAX_STRING_SIZE + 1];
+                struct obd_device *osc_obd = lov->lov_tgts[index]->ltd_exp->exp_obd;
+                cfs_proc_dir_entry_t *osc_symlink;
+                char name[MAX_STRING_SIZE];
 
                 LASSERT(osc_obd != NULL);
-                LASSERT(osc_obd->obd_type != NULL);
+                LASSERT(osc_obd->obd_magic == OBD_DEVICE_MAGIC);
                 LASSERT(osc_obd->obd_type->typ_name != NULL);
-                name[MAX_STRING_SIZE] = '\0';
                 snprintf(name, MAX_STRING_SIZE, "../../../%s/%s",
                          osc_obd->obd_type->typ_name,
                          osc_obd->obd_name);
-                osc_symlink = proc_symlink(osc_obd->obd_name, lov_proc_dir,
-                                           name);
+                osc_symlink = lprocfs_add_symlink(osc_obd->obd_name, lov_proc_dir,
+                                                  name);
                 if (osc_symlink == NULL) {
                         CERROR("could not register LOV target "
-                               "/proc/fs/lustre/%s/%s/target_obds/%s\n",
+                               "/proc/fs/lustre/%s/%s/target_obds/%s.",
                                obd->obd_type->typ_name, obd->obd_name,
                                osc_obd->obd_name);
-                        lprocfs_remove(lov_proc_dir);
-                        lov_proc_dir = NULL;
+                        lprocfs_remove(&lov_proc_dir);
                 }
         }
 #endif
 
+        rc = qos_add_tgt(obd, index);
+        if (rc)
+                CERROR("qos_add_tgt failed %d\n", rc);
+
         RETURN(0);
 }
 
-static int lov_connect(struct lustre_handle *conn, struct obd_device *obd,
+static int lov_connect(const struct lu_env *env,
+                       struct obd_export **exp, struct obd_device *obd,
                        struct obd_uuid *cluuid, struct obd_connect_data *data,
-                       unsigned long flags)
+                       void *localdata)
 {
-#ifdef __KERNEL__
-        struct proc_dir_entry *lov_proc_dir;
-#endif
         struct lov_obd *lov = &obd->u.lov;
         struct lov_tgt_desc *tgt;
-        struct obd_export *exp;
-        int rc, rc2, i;
+        struct lustre_handle conn;
+        int i, rc;
         ENTRY;
 
-        rc = class_connect(conn, obd, cluuid);
+        CDEBUG(D_CONFIG, "connect #%d\n", lov->lov_connects);
+
+        rc = class_connect(&conn, obd, cluuid);
         if (rc)
                 RETURN(rc);
 
-        exp = class_conn2export(conn);
+        *exp = class_conn2export(&conn);
 
-        /* We don't want to actually do the underlying connections more than
-         * once, so keep track. */
-        lov->refcount++;
-        if (lov->refcount > 1) {
-                class_export_put(exp);
-                RETURN(0);
-        }
+        /* Why should there ever be more than 1 connect? */
+        lov->lov_connects++;
+        LASSERT(lov->lov_connects == 1);
 
-#ifdef __KERNEL__
-        lov_proc_dir = lprocfs_register("target_obds", obd->obd_proc_entry,
-                                        NULL, NULL);
-        if (IS_ERR(lov_proc_dir)) {
-                CERROR("could not register /proc/fs/lustre/%s/%s/target_obds.",
-                       obd->obd_type->typ_name, obd->obd_name);
-                lov_proc_dir = NULL;
-        }
-#endif
+        memset(&lov->lov_ocd, 0, sizeof(lov->lov_ocd));
+        if (data)
+                lov->lov_ocd = *data;
 
-        /* connect_flags is the MDS number, save for use in lov_add_obd */
-        lov->lov_connect_flags = flags;
-        for (i = 0, tgt = lov->tgts; i < lov->desc.ld_tgt_count; i++, tgt++) {
-                if (obd_uuid_empty(&tgt->uuid))
+        obd_getref(obd);
+        for (i = 0; i < lov->desc.ld_tgt_count; i++) {
+                tgt = lov->lov_tgts[i];
+                if (!tgt || obd_uuid_empty(&tgt->ltd_uuid))
+                        continue;
+                /* Flags will be lowest common denominator */
+                rc = lov_connect_obd(obd, i, tgt->ltd_activate, &lov->lov_ocd);
+                if (rc) {
+                        CERROR("%s: lov connect tgt %d failed: %d\n",
+                               obd->obd_name, i, rc);
+                        continue;
+                }
+                /* connect to administrative disabled ost */
+                if (!lov->lov_tgts[i]->ltd_exp)
                         continue;
-                rc = lov_connect_obd(obd, tgt, 0, data, flags);
-                if (rc)
-                        GOTO(out_disc, rc);
-        }
-
-        class_export_put(exp);
-        RETURN (0);
-
- out_disc:
-#ifdef __KERNEL__
-        if (lov_proc_dir)
-                lprocfs_remove(lov_proc_dir);
-#endif
-
-        while (i-- > 0) {
-                struct obd_uuid uuid;
-                --tgt;
-                lov_tgt_clear_flags(lov, tgt, LTD_ACTIVE);
 
-                /* save for CERROR below; (we know it's terminated) */
-                uuid = tgt->uuid;
-                rc2 = obd_disconnect(tgt->ltd_exp, 0);
-                if (rc2)
-                        CERROR("error: LOV target %s disconnect on OST idx %d: "
-                               "rc = %d\n", uuid.uuid, i, rc2);
+                rc = lov_notify(obd, lov->lov_tgts[i]->ltd_exp->exp_obd,
+                                OBD_NOTIFY_CONNECT, (void *)&i);
+                if (rc) {
+                        CERROR("%s error sending notify %d\n",
+                               obd->obd_name, rc);
+                }
         }
-        class_disconnect(exp, 0);
-        RETURN (rc);
+        obd_putref(obd);
+
+        RETURN(0);
 }
 
-static int lov_disconnect_obd(struct obd_device *obd, 
-                             struct lov_tgt_desc *tgt,
-                              unsigned long flags)
+static int lov_disconnect_obd(struct obd_device *obd, struct lov_tgt_desc *tgt)
 {
-#ifdef __KERNEL__
-        struct proc_dir_entry *lov_proc_dir;
-#endif
-        struct obd_device *osc_obd = class_exp2obd(tgt->ltd_exp);
+        cfs_proc_dir_entry_t *lov_proc_dir;
         struct lov_obd *lov = &obd->u.lov;
+        struct obd_device *osc_obd;
         int rc;
         ENTRY;
 
-#ifdef __KERNEL__
+        osc_obd = class_exp2obd(tgt->ltd_exp);
+        CDEBUG(D_CONFIG, "%s: disconnecting target %s\n",
+               obd->obd_name, osc_obd->obd_name);
+
+        if (tgt->ltd_active) {
+                tgt->ltd_active = 0;
+                lov->desc.ld_active_tgt_count--;
+                tgt->ltd_exp->exp_obd->obd_inactive = 1;
+        }
+
         lov_proc_dir = lprocfs_srch(obd->obd_proc_entry, "target_obds");
         if (lov_proc_dir) {
-                struct proc_dir_entry *osc_symlink;
+                cfs_proc_dir_entry_t *osc_symlink;
 
                 osc_symlink = lprocfs_srch(lov_proc_dir, osc_obd->obd_name);
                 if (osc_symlink) {
-                        lprocfs_remove(osc_symlink);
+                        lprocfs_remove(&osc_symlink);
                 } else {
-                        CERROR("/proc/fs/lustre/%s/%s/target_obds/%s missing\n",
+                        CERROR("/proc/fs/lustre/%s/%s/target_obds/%s missing.",
                                obd->obd_type->typ_name, obd->obd_name,
                                osc_obd->obd_name);
                 }
         }
-#endif
-        if (obd->obd_no_recov) {
+
+        if (osc_obd) {
                 /* Pass it on to our clients.
                  * XXX This should be an argument to disconnect,
                  * XXX not a back-door flag on the OBD.  Ah well.
                  */
-                if (osc_obd)
-                        osc_obd->obd_no_recov = 1;
+                osc_obd->obd_force = obd->obd_force;
+                osc_obd->obd_fail = obd->obd_fail;
+                osc_obd->obd_no_recov = obd->obd_no_recov;
         }
 
-        /* XXX - shouldn't this be after the obd_disconnect() ? */
-        obd_register_observer(tgt->ltd_exp->exp_obd, NULL);
+        obd_register_observer(osc_obd, NULL);
 
-        rc = obd_disconnect(tgt->ltd_exp, flags);
+        rc = obd_disconnect(tgt->ltd_exp);
         if (rc) {
-                if (lov_tgt_active(lov, tgt, 0)) {
-                        lov_tgt_decref(lov, tgt);
-                        CERROR("Target %s disconnect error %d\n",
-                               tgt->uuid.uuid, rc);
-                }
+                CERROR("Target %s disconnect error %d\n",
+                       tgt->ltd_uuid.uuid, rc);
+                rc = 0;
         }
 
-        CDEBUG(D_CONFIG, "idx: %d flags: 0x%x active: %d\n",
-               tgt - lov->tgts, tgt->ltd_flags,
-               lov->desc.ld_active_tgt_count);
+        qos_del_tgt(obd, tgt);
 
-        lov_tgt_clear_flags(lov, tgt, LTD_ACTIVE);
         tgt->ltd_exp = NULL;
         RETURN(0);
 }
 
-static int lov_disconnect(struct obd_export *exp, unsigned long flags)
+static int lov_disconnect(struct obd_export *exp)
 {
         struct obd_device *obd = class_exp2obd(exp);
-#ifdef __KERNEL__
-        struct proc_dir_entry *lov_proc_dir;
-#endif
         struct lov_obd *lov = &obd->u.lov;
-        struct lov_tgt_desc *tgt;
-        int rc, i;
+        int i, rc;
         ENTRY;
 
-        if (!lov->tgts)
-                goto out_local;
+        if (!lov->lov_tgts)
+                goto out;
 
         /* Only disconnect the underlying layers on the final disconnect. */
-        lov->refcount--;
-        if (lov->refcount != 0)
-                goto out_local;
-
-        for (i = 0, tgt = lov->tgts; i < lov->desc.ld_tgt_count; i++, tgt++) {
-                if (tgt->ltd_exp)
-                        lov_disconnect_obd(obd, tgt, flags);
+        lov->lov_connects--;
+        if (lov->lov_connects != 0) {
+                /* why should there be more than 1 connect? */
+                CERROR("disconnect #%d\n", lov->lov_connects);
+                goto out;
         }
 
-#ifdef __KERNEL__
-        lov_proc_dir = lprocfs_srch(obd->obd_proc_entry, "target_obds");
-        if (lov_proc_dir) {
-                lprocfs_remove(lov_proc_dir);
-        } else {
-                CERROR("/proc/fs/lustre/%s/%s/target_obds missing.",
-                       obd->obd_type->typ_name, obd->obd_name);
+        /* Let's hold another reference so lov_del_obd doesn't spin through
+           putref every time */
+        obd_getref(obd);
+
+        for (i = 0; i < lov->desc.ld_tgt_count; i++) {
+                if (lov->lov_tgts[i] && lov->lov_tgts[i]->ltd_exp) {
+                        /* Disconnection is the last we know about an obd */
+                        lov_del_target(obd, i, 0, lov->lov_tgts[i]->ltd_gen);
+                }
         }
-#endif
-        
- out_local:
-        rc = class_disconnect(exp, 0);
+        obd_putref(obd);
+
+out:
+        rc = class_disconnect(exp); /* bz 9811 */
         RETURN(rc);
 }
 
@@ -321,367 +382,590 @@ static int lov_disconnect(struct obd_export *exp, unsigned long flags)
  *  -EINVAL  : UUID can't be found in the LOV's target list
  *  -ENOTCONN: The UUID is found, but the target connection is bad (!)
  *  -EBADF   : The UUID is found, but the OBD is the wrong type (!)
+ *  any >= 0 : is log target index
  */
-static int lov_set_osc_active(struct lov_obd *lov, struct obd_uuid *uuid,
+static int lov_set_osc_active(struct obd_device *obd, struct obd_uuid *uuid,
                               int activate)
 {
+        struct lov_obd *lov = &obd->u.lov;
         struct lov_tgt_desc *tgt;
-        int i, rc = 0;
+        int index;
         ENTRY;
 
         CDEBUG(D_INFO, "Searching in lov %p for uuid %s (activate=%d)\n",
                lov, uuid->uuid, activate);
 
-        lov_tgts_lock(lov);
-        for (i = 0, tgt = lov->tgts; i < lov->desc.ld_tgt_count; i++, tgt++) {
-                if (tgt->ltd_exp == NULL)
+        obd_getref(obd);
+        for (index = 0; index < lov->desc.ld_tgt_count; index++) {
+                tgt = lov->lov_tgts[index];
+                if (!tgt || !tgt->ltd_exp)
                         continue;
 
                 CDEBUG(D_INFO, "lov idx %d is %s conn "LPX64"\n",
-                       i, tgt->uuid.uuid, tgt->ltd_exp->exp_handle.h_cookie);
-                
-                if (obd_uuid_equals(uuid, &tgt->uuid))
+                       index, obd_uuid2str(&tgt->ltd_uuid),
+                       tgt->ltd_exp->exp_handle.h_cookie);
+                if (obd_uuid_equals(uuid, &tgt->ltd_uuid))
                         break;
         }
 
-        if (i == lov->desc.ld_tgt_count)
-                GOTO(out, rc = -EINVAL);
+        if (index == lov->desc.ld_tgt_count)
+                GOTO(out, index = -EINVAL);
+
+        if (lov->lov_tgts[index]->ltd_active == activate) {
+                CDEBUG(D_INFO, "OSC %s already %sactive!\n", uuid->uuid,
+                       activate ? "" : "in");
+                GOTO(out, index);
+        }
+
+        CDEBUG(D_CONFIG, "Marking OSC %s %sactive\n", obd_uuid2str(uuid),
+               activate ? "" : "in");
+
+        lov->lov_tgts[index]->ltd_active = activate;
 
         if (activate) {
-                if (tgt->ltd_flags & LTD_ACTIVE) {
-                        CDEBUG(D_CONFIG|D_INFO, "OSC %s already active!\n",
-                               uuid->uuid);
-                        GOTO(out, rc);
-                }
-                CDEBUG(D_INFO, "Marking OSC %s active\n", uuid->uuid);
-                tgt->ltd_flags |= LTD_ACTIVE;
                 lov->desc.ld_active_tgt_count++;
+                lov->lov_tgts[index]->ltd_exp->exp_obd->obd_inactive = 0;
         } else {
-                if ((tgt->ltd_flags & LTD_ACTIVE) == 0) {
-                        CDEBUG(D_CONFIG|D_INFO, "OSC %s already inactive!\n",
-                               uuid->uuid);
-                        GOTO(out, rc);
-                }
-                CDEBUG(D_INFO, "Marking OSC %s inactive\n", uuid->uuid);
-                tgt->ltd_flags &= ~LTD_ACTIVE;
                 lov->desc.ld_active_tgt_count--;
+                lov->lov_tgts[index]->ltd_exp->exp_obd->obd_inactive = 1;
         }
-        EXIT;
+        /* remove any old qos penalty */
+        lov->lov_tgts[index]->ltd_qos.ltq_penalty = 0;
+
  out:
-        lov_tgts_unlock(lov);
-        return rc;
+        obd_putref(obd);
+        RETURN(index);
 }
 
 static int lov_notify(struct obd_device *obd, struct obd_device *watched,
-                      int active, void *data)
+                      enum obd_notify_event ev, void *data)
 {
-        struct obd_uuid *uuid;
-        int rc;
+        int rc = 0;
         ENTRY;
 
-        if (strcmp(watched->obd_type->typ_name, OBD_OSC_DEVICENAME)) {
-                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;
+        if (ev == OBD_NOTIFY_ACTIVE || ev == OBD_NOTIFY_INACTIVE) {
+                struct obd_uuid *uuid;
 
-        /* Set OSC as active before notifying the observer, so the
-         * observer can use the OSC normally.  
-         */
-        rc = lov_set_osc_active(&obd->u.lov, 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, data);
-
-        RETURN(rc);
-}
+                LASSERT(watched);
 
-int lov_attach(struct obd_device *dev, obd_count len, void *data)
-{
-        struct lprocfs_static_vars lvars;
-        int rc;
+                if (strcmp(watched->obd_type->typ_name, LUSTRE_OSC_NAME)) {
+                        CERROR("unexpected notification of %s %s!\n",
+                               watched->obd_type->typ_name,
+                               watched->obd_name);
+                        RETURN(-EINVAL);
+                }
+                uuid = &watched->u.cli.cl_target_uuid;
 
-        lprocfs_init_vars(lov, &lvars);
-        rc = lprocfs_obd_attach(dev, lvars.obd_vars);
-        if (rc == 0) {
-#ifdef __KERNEL__
-                struct proc_dir_entry *entry;
+                /* Set OSC as active before notifying the observer, so the
+                 * observer can use the OSC normally.
+                 */
+                rc = lov_set_osc_active(obd, uuid, ev == OBD_NOTIFY_ACTIVE);
+                if (rc < 0) {
+                        CERROR("%sactivation of %s failed: %d\n",
+                               (ev == OBD_NOTIFY_ACTIVE) ? "" : "de",
+                               obd_uuid2str(uuid), rc);
+                        RETURN(rc);
+                }
+                /* active event should be pass lov target index as data */
+                data = &rc;
+        }
 
-                entry = create_proc_entry("target_obd_status", 0444, 
-                                          dev->obd_proc_entry);
-                if (entry == NULL) {
-                        rc = -ENOMEM;
-                } else {
-                        entry->proc_fops = &lov_proc_target_fops;
-                        entry->data = dev;
+        /* Pass the notification up the chain. */
+        if (watched) {
+                rc = obd_notify_observer(obd, watched, ev, data);
+        } else {
+                /* NULL watched means all osc's in the lov (only for syncs) */
+                /* sync event should be send lov idx as data */
+                struct lov_obd *lov = &obd->u.lov;
+                struct obd_device *tgt_obd;
+                int i;
+                obd_getref(obd);
+                for (i = 0; i < lov->desc.ld_tgt_count; i++) {
+                        /* don't send sync event if target not
+                         * connected/activated */
+                        if (!lov->lov_tgts[i] ||
+                            !lov->lov_tgts[i]->ltd_active)
+                                 continue;
+
+                        if ((ev == OBD_NOTIFY_SYNC) ||
+                            (ev == OBD_NOTIFY_SYNC_NONBLOCK))
+                                data = &i;
+
+                        tgt_obd = class_exp2obd(lov->lov_tgts[i]->ltd_exp);
+
+                        rc = obd_notify_observer(obd, tgt_obd, ev, data);
+                        if (rc) {
+                                CERROR("%s: notify %s of %s failed %d\n",
+                                       obd->obd_name,
+                                       obd->obd_observer->obd_name,
+                                       tgt_obd->obd_name, rc);
+                                break;
+                        }
                 }
-#endif
+                obd_putref(obd);
         }
-        return rc;
-}
 
-int lov_detach(struct obd_device *dev)
-{
-        return lprocfs_obd_detach(dev);
+        RETURN(rc);
 }
 
-static int lov_setup(struct obd_device *obd, obd_count len, void *buf)
+int lov_add_target(struct obd_device *obd, struct obd_uuid *uuidp,
+                   __u32 index, int gen, int active)
 {
         struct lov_obd *lov = &obd->u.lov;
-        struct lustre_cfg *lcfg = buf;
-        struct lov_desc *desc;
-        int count;
+        struct lov_tgt_desc *tgt;
+        struct obd_device *tgt_obd;
+        int rc;
         ENTRY;
 
-        if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1) {
-                CERROR("LOV setup requires a descriptor\n");
-                RETURN(-EINVAL);
-        }
+        CDEBUG(D_CONFIG, "uuid:%s idx:%d gen:%d active:%d\n",
+               uuidp->uuid, index, gen, active);
 
-        desc = (struct lov_desc *)lustre_cfg_string(lcfg, 1);
-        if (sizeof(*desc) > LUSTRE_CFG_BUFLEN(lcfg, 1)) {
-                CERROR("descriptor size wrong: %d > %d\n",
-                       (int)sizeof(*desc), LUSTRE_CFG_BUFLEN(lcfg, 1));
-                RETURN(-EINVAL);
-        }
-        /* Because of 64-bit divide/mod operations only work with a 32-bit
-         * divisor in a 32-bit kernel, we cannot support a stripe width
-         * of 4GB or larger on 32-bit CPUs.
-         */
-       
-        count = desc->ld_default_stripe_count;
-        if (count && (count * desc->ld_default_stripe_size) > ~0UL) {
-                CERROR("LOV: stripe width "LPU64"x%u > %lu on 32-bit system\n",
-                       desc->ld_default_stripe_size, count, ~0UL);
+        if (gen <= 0) {
+                CERROR("request to add OBD %s with invalid generation: %d\n",
+                       uuidp->uuid, gen);
                 RETURN(-EINVAL);
         }
 
-        lov->bufsize = sizeof(struct lov_tgt_desc) * LOV_MAX_TGT_COUNT;  
-        OBD_ALLOC(lov->tgts, lov->bufsize);
-        if (lov->tgts == NULL) {
-                lov->bufsize = 0;
-                CERROR("couldn't allocate %d bytes for target table.\n",
-                       lov->bufsize);
+        tgt_obd = class_find_client_obd(uuidp, LUSTRE_OSC_NAME,
+                                        &obd->obd_uuid);
+        if (tgt_obd == NULL)
                 RETURN(-EINVAL);
-        }
 
-        desc->ld_tgt_count = 0;
-        desc->ld_active_tgt_count = 0;
-        lov->desc = *desc;
-        spin_lock_init(&lov->lov_lock);
-        sema_init(&lov->lov_llog_sem, 1);
-        init_waitqueue_head(&lov->lov_tgt_waitq);
+        cfs_mutex_down(&lov->lov_lock);
 
-        RETURN(0);
-}
+        if ((index < lov->lov_tgt_size) && (lov->lov_tgts[index] != NULL)) {
+                tgt = lov->lov_tgts[index];
+                CERROR("UUID %s already assigned at LOV target index %d\n",
+                       obd_uuid2str(&tgt->ltd_uuid), index);
+                cfs_mutex_up(&lov->lov_lock);
+                RETURN(-EEXIST);
+        }
 
-static int lov_cleanup(struct obd_device *obd, int flags)
-{
-        struct lov_obd *lov = &obd->u.lov;
+        if (index >= lov->lov_tgt_size) {
+                /* We need to reallocate the lov target array. */
+                struct lov_tgt_desc **newtgts, **old = NULL;
+                __u32 newsize, oldsize = 0;
 
-        OBD_FREE(lov->tgts, lov->bufsize);
-        RETURN(0);
-}
+                newsize = max(lov->lov_tgt_size, (__u32)2);
+                while (newsize < index + 1)
+                        newsize = newsize << 1;
+                OBD_ALLOC(newtgts, sizeof(*newtgts) * newsize);
+                if (newtgts == NULL) {
+                        cfs_mutex_up(&lov->lov_lock);
+                        RETURN(-ENOMEM);
+                }
 
-static int
-lov_add_obd(struct obd_device *obd, struct obd_uuid *uuidp, int index, int gen)
-{
-        struct lov_obd *lov = &obd->u.lov;
-        struct lov_tgt_desc *tgt;
-        int rc;
-        ENTRY;
+                if (lov->lov_tgt_size) {
+                        memcpy(newtgts, lov->lov_tgts, sizeof(*newtgts) *
+                               lov->lov_tgt_size);
+                        old = lov->lov_tgts;
+                        oldsize = lov->lov_tgt_size;
+                }
 
-        CDEBUG(D_CONFIG, "uuid: %s idx: %d gen: %d\n",
-               uuidp->uuid, index, gen);
+                lov->lov_tgts = newtgts;
+                lov->lov_tgt_size = newsize;
+#ifdef __KERNEL__
+                smp_rmb();
+#endif
+                if (old)
+                        OBD_FREE(old, sizeof(*old) * oldsize);
 
-        if ((index < 0) || (index >= LOV_MAX_TGT_COUNT)) {
-                CERROR("request to add OBD %s at invalid index: %d\n",
-                       uuidp->uuid, index);
-                RETURN(-EINVAL);
+                CDEBUG(D_CONFIG, "tgts: %p size: %d\n",
+                       lov->lov_tgts, lov->lov_tgt_size);
         }
 
-        if (gen <= 0) {
-                CERROR("request to add OBD %s with invalid generation: %d\n",
-                       uuidp->uuid, gen);
-                RETURN(-EINVAL);
+        OBD_ALLOC_PTR(tgt);
+        if (!tgt) {
+                cfs_mutex_up(&lov->lov_lock);
+                RETURN(-ENOMEM);
         }
 
-        tgt = lov->tgts + index;
-
-        lov_tgts_lock(lov);
-
-        if (!obd_uuid_empty(&tgt->uuid)) {
-                lov_tgts_unlock(lov);
-                CERROR("OBD already assigned at LOV target index %d\n",
-                       index);
-                RETURN(-EEXIST);
+        rc = lov_ost_pool_add(&lov->lov_packed, index, lov->lov_tgt_size);
+        if (rc) {
+                cfs_mutex_up(&lov->lov_lock);
+                OBD_FREE_PTR(tgt);
+                RETURN(rc);
         }
 
-        tgt->uuid = *uuidp;
+        memset(tgt, 0, sizeof(*tgt));
+        tgt->ltd_uuid = *uuidp;
+        tgt->ltd_obd = tgt_obd;
         /* XXX - add a sanity check on the generation number. */
         tgt->ltd_gen = gen;
-        tgt->ltd_flags = 0;
-
+        tgt->ltd_index = index;
+        tgt->ltd_activate = active;
+        lov->lov_tgts[index] = tgt;
         if (index >= lov->desc.ld_tgt_count)
                 lov->desc.ld_tgt_count = index + 1;
 
-        lov_tgts_unlock(lov);
+        cfs_mutex_up(&lov->lov_lock);
 
-        CDEBUG(D_CONFIG, "idx: %d ltd_gen: %d ld_tgt_count: %d\n",
+        CDEBUG(D_CONFIG, "idx=%d ltd_gen=%d ld_tgt_count=%d\n",
                 index, tgt->ltd_gen, lov->desc.ld_tgt_count);
 
-        if (lov->refcount == 0)
+        if (lov->lov_connects == 0) {
+                /* lov_connect hasn't been called yet. We'll do the
+                   lov_connect_obd on this target when that fn first runs,
+                   because we don't know the connect flags yet. */
                 RETURN(0);
-
-        /* We don't need to lock the tgt entry here because the
-         * config events are single threaded. Therefore only the
-         * current thread can be changing the tgts tbl. */
-        if (tgt->ltd_exp) {
-                struct obd_device *osc_obd;
-
-                osc_obd = class_exp2obd(tgt->ltd_exp);
-                if (osc_obd)
-                        osc_obd->obd_no_recov = 0;
         }
 
-        rc = lov_connect_obd(obd, tgt, 0, NULL, lov->lov_connect_flags);
+        obd_getref(obd);
+
+        rc = lov_connect_obd(obd, index, active, &lov->lov_ocd);
         if (rc)
                 GOTO(out, rc);
 
-        if (obd->obd_observer) {
-                /* tell the mds_lov about the new target */
-                rc = obd_notify(obd->obd_observer, tgt->ltd_exp->exp_obd, 1,
-                                (void *)index);
-        }
+        /* connect to administrative disabled ost */
+        if (!tgt->ltd_exp)
+                GOTO(out, rc = 0);
 
-        GOTO(out, rc);
- out:
-        if (rc && tgt->ltd_exp != NULL)
-                lov_disconnect_obd(obd, tgt, 0);
-        return rc;
+        rc = lov_notify(obd, tgt->ltd_exp->exp_obd,
+                        active ? OBD_NOTIFY_CONNECT : OBD_NOTIFY_INACTIVE,
+                        (void *)&index);
+
+out:
+        if (rc) {
+                CERROR("add failed (%d), deleting %s\n", rc,
+                       obd_uuid2str(&tgt->ltd_uuid));
+                lov_del_target(obd, index, 0, 0);
+        }
+        obd_putref(obd);
+        RETURN(rc);
 }
 
-static int
-lov_del_obd(struct obd_device *obd, struct obd_uuid *uuidp, int index, int gen)
+/* Schedule a target for deletion */
+int lov_del_target(struct obd_device *obd, __u32 index,
+                   struct obd_uuid *uuidp, int gen)
 {
         struct lov_obd *lov = &obd->u.lov;
-        struct lov_tgt_desc *tgt;
-        struct l_wait_info lwi = { 0 };
         int count = lov->desc.ld_tgt_count;
         int rc = 0;
         ENTRY;
 
-        CDEBUG(D_CONFIG, "uuid: %s idx: %d gen: %d\n",
-               uuidp->uuid, index, gen);
-
         if (index >= count) {
                 CERROR("LOV target index %d >= number of LOV OBDs %d.\n",
                        index, count);
                 RETURN(-EINVAL);
         }
 
-        tgt = lov->tgts + index;
+        obd_getref(obd);
 
-        if (obd_uuid_empty(&tgt->uuid)) {
+        if (!lov->lov_tgts[index]) {
                 CERROR("LOV target at index %d is not setup.\n", index);
-                RETURN(-EINVAL);
+                GOTO(out, rc = -EINVAL);
         }
 
-        if (!obd_uuid_equals(uuidp, &tgt->uuid)) {
+        if (uuidp && !obd_uuid_equals(uuidp, &lov->lov_tgts[index]->ltd_uuid)) {
                 CERROR("LOV target UUID %s at index %d doesn't match %s.\n",
-                       tgt->uuid.uuid, index, uuidp->uuid);
-                RETURN(-EINVAL);
+                       lov_uuid2str(lov, index), index,
+                       obd_uuid2str(uuidp));
+                GOTO(out, rc = -EINVAL);
         }
 
-        lov_tgt_set_flags(lov, tgt, LTD_DEL_PENDING);
+        CDEBUG(D_CONFIG, "uuid: %s idx: %d gen: %d exp: %p active: %d\n",
+               lov_uuid2str(lov, index), index,
+               lov->lov_tgts[index]->ltd_gen, lov->lov_tgts[index]->ltd_exp,
+               lov->lov_tgts[index]->ltd_active);
 
-        if (tgt->ltd_exp) {
-                struct obd_device *osc_obd;
+        lov->lov_tgts[index]->ltd_reap = 1;
+        lov->lov_death_row++;
+        /* we really delete it from obd_putref */
+out:
+        obd_putref(obd);
 
-                rc = obd_cancel_unused(tgt->ltd_exp, NULL,
-                                       LDLM_FL_CONFIG_CHANGE, NULL);
-                if (rc != 0)
-                        CWARN("obd_cancel_unused(osc): %d\n", rc);
-
-                osc_obd = class_exp2obd(tgt->ltd_exp);
-                if (osc_obd) {
-                        osc_obd->obd_no_recov = 1;
-                        rc = obd_llog_finish(osc_obd, &osc_obd->obd_llogs, 1);
-                        if (rc)
-                                CERROR("osc_llog_finish error: %d\n", rc);
-                }
+        RETURN(rc);
+}
 
-                lov_disconnect_obd(obd, tgt, 0);
-        }
+static void __lov_del_obd(struct obd_device *obd, struct lov_tgt_desc *tgt)
+{
+        struct obd_device *osc_obd;
 
-        CDEBUG(D_CONFIG, "Sleeping until LOV target index %d UUID %s "
-               "is quiesced; ltd_refcount: %d ld_active_tgt_count: %d.\n",
-               index, uuidp->uuid, tgt->ltd_refcount,
-               lov->desc.ld_active_tgt_count);
+        LASSERT(tgt);
+        LASSERT(tgt->ltd_reap);
 
-        /* XXX - should we set a timeout ? */
-        lwi = LWI_TIMEOUT_INTR(0, NULL, NULL, NULL);
-        rc = l_wait_event(lov->lov_tgt_waitq, (tgt->ltd_refcount == 0), &lwi);
-        if (rc) {
-                lov_tgt_clear_flags(lov, tgt, LTD_DEL_PENDING);
-                CERROR("LOV target delete UUID %s index %d aborted: %d.\n",
-                       uuidp->uuid, index, rc);
-                RETURN(rc);
-        }
+        osc_obd = class_exp2obd(tgt->ltd_exp);
 
-        CDEBUG(D_CONFIG, "LOV target index %d UUID %s is quiesced; "
-               "ltd_refcount: %d ld_active_tgt_count: %d.\n",
-               index, uuidp->uuid, tgt->ltd_refcount,
-               lov->desc.ld_active_tgt_count);
+        CDEBUG(D_CONFIG, "Removing tgt %s : %s\n",
+               tgt->ltd_uuid.uuid,
+               osc_obd ? osc_obd->obd_name : "<no obd>");
 
-        /* XXX - right now there is a dependency on ld_tgt_count being the
-         * maximum tgt index for computing the mds_max_easize. So we can't
-         * shrink it. */
+        if (tgt->ltd_exp)
+                lov_disconnect_obd(obd, tgt);
 
-        /* lt_gen = 0 will mean it will not match the gen of any valid loi */
-        memset(tgt, 0, sizeof(*tgt));
-        RETURN(rc);
+        OBD_FREE_PTR(tgt);
+
+        /* Manual cleanup - no cleanup logs to clean up the osc's.  We must
+           do it ourselves. And we can't do it from lov_cleanup,
+           because we just lost our only reference to it. */
+        if (osc_obd)
+                class_manual_cleanup(osc_obd);
 }
 
-static int lov_process_config(struct obd_device *obd, obd_count len, void *buf)
+void lov_fix_desc_stripe_size(__u64 *val)
 {
-        struct lustre_cfg *lcfg = buf;
-        struct obd_uuid obd_uuid;
-        int cmd;
-        int index;
-        int gen;
-        int rc = 0;
-        ENTRY;
+        if (*val < PTLRPC_MAX_BRW_SIZE) {
+                LCONSOLE_WARN("Increasing default stripe size to min %u\n",
+                              PTLRPC_MAX_BRW_SIZE);
+                *val = PTLRPC_MAX_BRW_SIZE;
+        } else if (*val & (LOV_MIN_STRIPE_SIZE - 1)) {
+                *val &= ~(LOV_MIN_STRIPE_SIZE - 1);
+                LCONSOLE_WARN("Changing default stripe size to "LPU64" (a "
+                              "multiple of %u)\n",
+                              *val, LOV_MIN_STRIPE_SIZE);
+        }
+}
 
-        switch(cmd = lcfg->lcfg_command) {
-        case LCFG_LOV_ADD_OBD:
-        case LCFG_LOV_DEL_OBD: {
-                if (LUSTRE_CFG_BUFLEN(lcfg, 1) > sizeof(obd_uuid.uuid))
-                        GOTO(out, rc = -EINVAL);
+void lov_fix_desc_stripe_count(__u32 *val)
+{
+        if (*val == 0)
+                *val = 1;
+}
 
-                obd_str2uuid(&obd_uuid, lustre_cfg_string(lcfg, 1));
+void lov_fix_desc_pattern(__u32 *val)
+{
+        /* from lov_setstripe */
+        if ((*val != 0) && (*val != LOV_PATTERN_RAID0)) {
+                LCONSOLE_WARN("Unknown stripe pattern: %#x\n", *val);
+                *val = 0;
+        }
+}
 
-                if (sscanf(lustre_cfg_buf(lcfg, 2), "%d", &index) != 1)
+void lov_fix_desc_qos_maxage(__u32 *val)
+{
+        /* fix qos_maxage */
+        if (*val == 0)
+                *val = QOS_DEFAULT_MAXAGE;
+}
+
+void lov_fix_desc(struct lov_desc *desc)
+{
+        lov_fix_desc_stripe_size(&desc->ld_default_stripe_size);
+        lov_fix_desc_stripe_count(&desc->ld_default_stripe_count);
+        lov_fix_desc_pattern(&desc->ld_pattern);
+        lov_fix_desc_qos_maxage(&desc->ld_qos_maxage);
+}
+
+int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
+{
+        struct lprocfs_static_vars lvars = { 0 };
+        struct lov_desc *desc;
+        struct lov_obd *lov = &obd->u.lov;
+        int rc;
+        ENTRY;
+
+        if (LUSTRE_CFG_BUFLEN(lcfg, 1) < 1) {
+                CERROR("LOV setup requires a descriptor\n");
+                RETURN(-EINVAL);
+        }
+
+        desc = (struct lov_desc *)lustre_cfg_buf(lcfg, 1);
+
+        if (sizeof(*desc) > LUSTRE_CFG_BUFLEN(lcfg, 1)) {
+                CERROR("descriptor size wrong: %d > %d\n",
+                       (int)sizeof(*desc), LUSTRE_CFG_BUFLEN(lcfg, 1));
+                RETURN(-EINVAL);
+        }
+
+        if (desc->ld_magic != LOV_DESC_MAGIC) {
+                if (desc->ld_magic == __swab32(LOV_DESC_MAGIC)) {
+                            CDEBUG(D_OTHER, "%s: Swabbing lov desc %p\n",
+                                   obd->obd_name, desc);
+                            lustre_swab_lov_desc(desc);
+                } else {
+                        CERROR("%s: Bad lov desc magic: %#x\n",
+                               obd->obd_name, desc->ld_magic);
+                        RETURN(-EINVAL);
+                }
+        }
+
+        lov_fix_desc(desc);
+
+        desc->ld_active_tgt_count = 0;
+        lov->desc = *desc;
+        lov->lov_tgt_size = 0;
+
+        cfs_sema_init(&lov->lov_lock, 1);
+        cfs_atomic_set(&lov->lov_refcount, 0);
+        CFS_INIT_LIST_HEAD(&lov->lov_qos.lq_oss_list);
+        cfs_init_rwsem(&lov->lov_qos.lq_rw_sem);
+        lov->lov_sp_me = LUSTRE_SP_CLI;
+        lov->lov_qos.lq_dirty = 1;
+        lov->lov_qos.lq_rr.lqr_dirty = 1;
+        lov->lov_qos.lq_reset = 1;
+        /* Default priority is toward free space balance */
+        lov->lov_qos.lq_prio_free = 232;
+        /* Default threshold for rr (roughly 17%) */
+        lov->lov_qos.lq_threshold_rr = 43;
+        /* Init statfs fields */
+        OBD_ALLOC_PTR(lov->lov_qos.lq_statfs_data);
+        if (NULL == lov->lov_qos.lq_statfs_data)
+                RETURN(-ENOMEM);
+        cfs_waitq_init(&lov->lov_qos.lq_statfs_waitq);
+
+        lov->lov_pools_hash_body = cfs_hash_create("POOLS", HASH_POOLS_CUR_BITS,
+                                                   HASH_POOLS_MAX_BITS,
+                                                   &pool_hash_operations, CFS_HASH_REHASH);
+        CFS_INIT_LIST_HEAD(&lov->lov_pool_list);
+        lov->lov_pool_count = 0;
+        rc = lov_ost_pool_init(&lov->lov_packed, 0);
+        if (rc)
+                RETURN(rc);
+        rc = lov_ost_pool_init(&lov->lov_qos.lq_rr.lqr_pool, 0);
+        if (rc) {
+                lov_ost_pool_free(&lov->lov_packed);
+                RETURN(rc);
+        }
+
+        lprocfs_lov_init_vars(&lvars);
+        lprocfs_obd_setup(obd, lvars.obd_vars);
+#ifdef LPROCFS
+        {
+                int rc;
+
+                rc = lprocfs_seq_create(obd->obd_proc_entry, "target_obd",
+                                        0444, &lov_proc_target_fops, obd);
+                if (rc)
+                        CWARN("Error adding the target_obd file\n");
+        }
+#endif
+        lov->lov_pool_proc_entry = lprocfs_register("pools",
+                                                    obd->obd_proc_entry,
+                                                    NULL, NULL);
+
+        RETURN(0);
+}
+
+static int lov_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
+{
+        int rc = 0;
+        struct lov_obd *lov = &obd->u.lov;
+
+        ENTRY;
+
+        switch (stage) {
+        case OBD_CLEANUP_EARLY: {
+                int i;
+                for (i = 0; i < lov->desc.ld_tgt_count; i++) {
+                        if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_active)
+                                continue;
+                        obd_precleanup(class_exp2obd(lov->lov_tgts[i]->ltd_exp),
+                                       OBD_CLEANUP_EARLY);
+                }
+                break;
+        }
+        case OBD_CLEANUP_EXPORTS:
+                rc = obd_llog_finish(obd, 0);
+                if (rc != 0)
+                        CERROR("failed to cleanup llogging subsystems\n");
+                break;
+        }
+        RETURN(rc);
+}
+
+static int lov_cleanup(struct obd_device *obd)
+{
+        struct lov_obd *lov = &obd->u.lov;
+        cfs_list_t *pos, *tmp;
+        struct pool_desc *pool;
+
+        cfs_list_for_each_safe(pos, tmp, &lov->lov_pool_list) {
+                pool = cfs_list_entry(pos, struct pool_desc, pool_list);
+                /* free pool structs */
+                CDEBUG(D_INFO, "delete pool %p\n", pool);
+                lov_pool_del(obd, pool->pool_name);
+        }
+        cfs_hash_destroy(lov->lov_pools_hash_body);
+        lov_ost_pool_free(&(lov->lov_qos.lq_rr.lqr_pool));
+        lov_ost_pool_free(&lov->lov_packed);
+
+        if (lov->lov_tgts) {
+                int i;
+                obd_getref(obd);
+                for (i = 0; i < lov->desc.ld_tgt_count; i++) {
+                        if (!lov->lov_tgts[i])
+                                continue;
+
+                        /* Inactive targets may never have connected */
+                        if (lov->lov_tgts[i]->ltd_active ||
+                            cfs_atomic_read(&lov->lov_refcount))
+                            /* We should never get here - these
+                               should have been removed in the
+                             disconnect. */
+                                CERROR("lov tgt %d not cleaned!"
+                                       " deathrow=%d, lovrc=%d\n",
+                                       i, lov->lov_death_row,
+                                       cfs_atomic_read(&lov->lov_refcount));
+                        lov_del_target(obd, i, 0, 0);
+                }
+                obd_putref(obd);
+                OBD_FREE(lov->lov_tgts, sizeof(*lov->lov_tgts) *
+                         lov->lov_tgt_size);
+                lov->lov_tgt_size = 0;
+        }
+
+        /* clear pools parent proc entry only after all pools is killed */
+        lprocfs_obd_cleanup(obd);
+
+        OBD_FREE_PTR(lov->lov_qos.lq_statfs_data);
+        RETURN(0);
+}
+
+int lov_process_config_base(struct obd_device *obd, struct lustre_cfg *lcfg,
+                            __u32 *indexp, int *genp)
+{
+        struct obd_uuid obd_uuid;
+        int cmd;
+        int rc = 0;
+        ENTRY;
+
+        switch(cmd = lcfg->lcfg_command) {
+        case LCFG_LOV_ADD_OBD:
+        case LCFG_LOV_ADD_INA:
+        case LCFG_LOV_DEL_OBD: {
+                __u32 index;
+                int gen;
+                /* lov_modify_tgts add  0:lov_mdsA  1:ost1_UUID  2:0  3:1 */
+                if (LUSTRE_CFG_BUFLEN(lcfg, 1) > sizeof(obd_uuid.uuid))
+                        GOTO(out, rc = -EINVAL);
+
+                obd_str2uuid(&obd_uuid,  lustre_cfg_buf(lcfg, 1));
+
+                if (sscanf(lustre_cfg_buf(lcfg, 2), "%d", indexp) != 1)
                         GOTO(out, rc = -EINVAL);
-                if (sscanf(lustre_cfg_buf(lcfg, 3), "%d", &gen) != 1)
+                if (sscanf(lustre_cfg_buf(lcfg, 3), "%d", genp) != 1)
                         GOTO(out, rc = -EINVAL);
+                index = *indexp;
+                gen = *genp;
                 if (cmd == LCFG_LOV_ADD_OBD)
-                        rc = lov_add_obd(obd, &obd_uuid, index, gen);
+                        rc = lov_add_target(obd, &obd_uuid, index, gen, 1);
+                else if (cmd == LCFG_LOV_ADD_INA)
+                        rc = lov_add_target(obd, &obd_uuid, index, gen, 0);
                 else
-                        rc = lov_del_obd(obd, &obd_uuid, index, gen);
+                        rc = lov_del_target(obd, index, &obd_uuid, gen);
+                GOTO(out, rc);
+        }
+        case LCFG_PARAM: {
+                struct lprocfs_static_vars lvars = { 0 };
+                struct lov_desc *desc = &(obd->u.lov.desc);
+
+                if (!desc)
+                        GOTO(out, rc = -EINVAL);
+
+                lprocfs_lov_init_vars(&lvars);
+
+                rc = class_process_proc_param(PARAM_LOV, lvars.obd_vars,
+                                              lcfg, obd);
+                if (rc > 0)
+                        rc = 0;
                 GOTO(out, rc);
         }
+        case LCFG_POOL_NEW:
+        case LCFG_POOL_ADD:
+        case LCFG_POOL_DEL:
+        case LCFG_POOL_REM:
+                GOTO(out, rc);
+
         default: {
                 CERROR("Unknown command: %d\n", lcfg->lcfg_command);
                 GOTO(out, rc = -EINVAL);
@@ -693,18 +977,16 @@ out:
 }
 
 #ifndef log2
-#define log2(n) ffz(~(n))
+#define log2(n) cfs_ffz(~(n))
 #endif
 
-static int lov_clear_orphans(struct obd_export *export,
-                             struct obdo *src_oa,
+static int lov_clear_orphans(struct obd_export *export, struct obdo *src_oa,
                              struct lov_stripe_md **ea,
                              struct obd_trans_info *oti)
 {
         struct lov_obd *lov;
         struct obdo *tmp_oa;
         struct obd_uuid *ost_uuid = NULL;
-        struct lov_tgt_desc *tgt;
         int rc = 0, i;
         ENTRY;
 
@@ -713,73 +995,112 @@ static int lov_clear_orphans(struct obd_export *export,
 
         lov = &export->exp_obd->u.lov;
 
-        tmp_oa = obdo_alloc();
+        OBDO_ALLOC(tmp_oa);
         if (tmp_oa == NULL)
                 RETURN(-ENOMEM);
 
-        if (src_oa->o_valid & OBD_MD_FLINLINE) {
-                ost_uuid = (struct obd_uuid *)src_oa->o_inline;
+        if (oti->oti_ost_uuid) {
+                ost_uuid = oti->oti_ost_uuid;
                 CDEBUG(D_HA, "clearing orphans only for %s\n",
                        ost_uuid->uuid);
         }
 
-        for (i = 0, tgt = lov->tgts; i < lov->desc.ld_tgt_count; i++, tgt++) {
+        obd_getref(export->exp_obd);
+        for (i = 0; i < lov->desc.ld_tgt_count; i++) {
                 struct lov_stripe_md obj_md;
                 struct lov_stripe_md *obj_mdp = &obj_md;
-                int active = 0;
+                struct lov_tgt_desc *tgt;
                 int err;
 
+                tgt = lov->lov_tgts[i];
+                if (!tgt)
+                        continue;
+
                 /* if called for a specific target, we don't
                    care if it is not active. */
-                if (lov_tgt_active(lov, tgt, 0)) {
-                        active = 1;
-                } else if (ost_uuid == NULL) {
+                if (!lov->lov_tgts[i]->ltd_active && ost_uuid == NULL) {
                         CDEBUG(D_HA, "lov idx %d inactive\n", i);
                         continue;
                 }
 
-                if (ost_uuid && !obd_uuid_equals(ost_uuid, &tgt->uuid)) {
-                        if (active)
-                                lov_tgt_decref(lov, tgt);
+                if (ost_uuid && !obd_uuid_equals(ost_uuid, &tgt->ltd_uuid))
                         continue;
-                }
 
-                /* 
-                 * setting up objid OSS objects should be destroyed starting
-                 * from it.
-                 */
+                CDEBUG(D_CONFIG,"Clear orphans for %d:%s\n", i,
+                       obd_uuid2str(ost_uuid));
+
                 memcpy(tmp_oa, src_oa, sizeof(*tmp_oa));
-                tmp_oa->o_valid |= OBD_MD_FLID;
-                tmp_oa->o_id = oti->oti_objid[i];
 
+                LASSERT(lov->lov_tgts[i]->ltd_exp);
                 /* XXX: LOV STACKING: use real "obj_mdp" sub-data */
-                err = obd_create(tgt->ltd_exp, tmp_oa, NULL, 0, &obj_mdp, oti);
-                if (err)
+                err = obd_create(lov->lov_tgts[i]->ltd_exp,
+                                 tmp_oa, &obj_mdp, oti);
+                if (err) {
                         /* This export will be disabled until it is recovered,
                            and then orphan recovery will be completed. */
                         CERROR("error in orphan recovery on OST idx %d/%d: "
                                "rc = %d\n", i, lov->desc.ld_tgt_count, err);
-
-                if (active)
-                        lov_tgt_decref(lov, tgt);
+                        rc = err;
+                }
 
                 if (ost_uuid)
                         break;
         }
+        obd_putref(export->exp_obd);
+
+        OBDO_FREE(tmp_oa);
+        RETURN(rc);
+}
+
+static int lov_recreate(struct obd_export *exp, struct obdo *src_oa,
+                        struct lov_stripe_md **ea, struct obd_trans_info *oti)
+{
+        struct lov_stripe_md *obj_mdp, *lsm;
+        struct lov_obd *lov = &exp->exp_obd->u.lov;
+        unsigned ost_idx;
+        int rc, i;
+        ENTRY;
+
+        LASSERT(src_oa->o_valid & OBD_MD_FLFLAGS &&
+                src_oa->o_flags & OBD_FL_RECREATE_OBJS);
+
+        OBD_ALLOC(obj_mdp, sizeof(*obj_mdp));
+        if (obj_mdp == NULL)
+                RETURN(-ENOMEM);
+
+        ost_idx = src_oa->o_nlink;
+        lsm = *ea;
+        if (lsm == NULL)
+                GOTO(out, rc = -EINVAL);
+        if (ost_idx >= lov->desc.ld_tgt_count ||
+            !lov->lov_tgts[ost_idx])
+                GOTO(out, rc = -EINVAL);
+
+        for (i = 0; i < lsm->lsm_stripe_count; i++) {
+                if (lsm->lsm_oinfo[i]->loi_ost_idx == ost_idx) {
+                        if (lsm->lsm_oinfo[i]->loi_id != src_oa->o_id)
+                                GOTO(out, rc = -EINVAL);
+                        break;
+                }
+        }
+        if (i == lsm->lsm_stripe_count)
+                GOTO(out, rc = -EINVAL);
 
-        obdo_free(tmp_oa);
+        rc = obd_create(lov->lov_tgts[ost_idx]->ltd_exp, src_oa, &obj_mdp, oti);
+out:
+        OBD_FREE(obj_mdp, sizeof(*obj_mdp));
         RETURN(rc);
 }
 
 /* the LOV expects oa->o_id to be set to the LOV object id */
-static int
-lov_create(struct obd_export *exp, struct obdo *src_oa,
-           void *acl, int acl_size, struct lov_stripe_md **ea,
-           struct obd_trans_info *oti)
+static int lov_create(struct obd_export *exp, struct obdo *src_oa,
+                      struct lov_stripe_md **ea, struct obd_trans_info *oti)
 {
-        struct lov_request_set *set = NULL;
-        struct list_head *pos;
         struct lov_obd *lov;
+        struct obd_info oinfo;
+        struct lov_request_set *set = NULL;
+        struct lov_request *req;
+        struct l_wait_info  lwi = { 0 };
         int rc = 0;
         ENTRY;
 
@@ -793,246 +1114,271 @@ lov_create(struct obd_export *exp, struct obdo *src_oa,
                 RETURN(rc);
         }
 
-        LASSERT(oti->oti_flags & OBD_MODE_CROW);
-                
-        /* main creation loop */
-        rc = lov_prep_create_set(exp, ea, src_oa, oti, &set);
-        if (rc)
-                RETURN(rc);
-
         lov = &exp->exp_obd->u.lov;
+        if (!lov->desc.ld_active_tgt_count)
+                RETURN(-EIO);
+
+        obd_getref(exp->exp_obd);
+        /* Recreate a specific object id at the given OST index */
+        if ((src_oa->o_valid & OBD_MD_FLFLAGS) &&
+            (src_oa->o_flags & OBD_FL_RECREATE_OBJS)) {
+                 rc = lov_recreate(exp, src_oa, ea, oti);
+                 GOTO(out, rc);
+        }
 
-        list_for_each (pos, &set->set_list) {
-                struct lov_request *req = 
-                        list_entry(pos, struct lov_request, rq_link);
+        /* issue statfs rpcs if the osfs data is older than qos_maxage - 1s,
+         * later in alloc_qos(), we will wait for those rpcs to complete if
+         * the osfs age is older than 2 * qos_maxage */
+        qos_statfs_update(exp->exp_obd,
+                          cfs_time_shift_64(-lov->desc.ld_qos_maxage) + CFS_HZ,
+                          0);
 
+        rc = lov_prep_create_set(exp, &oinfo, ea, src_oa, oti, &set);
+        if (rc)
+                GOTO(out, rc);
+
+        cfs_list_for_each_entry(req, &set->set_list, rq_link) {
                 /* XXX: LOV STACKING: use real "obj_mdp" sub-data */
-                rc = obd_create(lov->tgts[req->rq_idx].ltd_exp,
-                                req->rq_oa, NULL, 0, &req->rq_md, oti);
-                lov_update_create_set(set, req, rc);
+                rc = obd_create_async(lov->lov_tgts[req->rq_idx]->ltd_exp,
+                                      &req->rq_oi, &req->rq_oi.oi_md, oti);
         }
+
+        /* osc_create have timeout equ obd_timeout/2 so waiting don't be
+         * longer then this */
+        l_wait_event(set->set_waitq, lov_finished_set(set), &lwi);
+
+        /* we not have ptlrpc set for assign set->interpret and should
+         * be call interpret function himself. calling from cb_create_update
+         * not permited because lov_fini_create_set can sleep for long time,
+         * but we must avoid sleeping in ptlrpcd interpret function. */
         rc = lov_fini_create_set(set, ea);
+out:
+        obd_putref(exp->exp_obd);
         RETURN(rc);
 }
 
-#define lsm_bad_magic(LSMP)                                     \
-({                                                              \
-        struct lov_stripe_md *_lsm__ = (LSMP);                  \
-        int _ret__ = 0;                                         \
-        if (!_lsm__) {                                          \
-                CERROR("LOV requires striping ea\n");           \
-                _ret__ = 1;                                     \
-        } else if (_lsm__->lsm_magic != LOV_MAGIC) {            \
-                CERROR("LOV striping magic bad %#x != %#x\n",   \
-                       _lsm__->lsm_magic, LOV_MAGIC);           \
-                _ret__ = 1;                                     \
-        }                                                       \
-        _ret__;                                                 \
-})
+#define ASSERT_LSM_MAGIC(lsmp)                                                  \
+do {                                                                            \
+        LASSERT((lsmp) != NULL);                                                \
+        LASSERTF(((lsmp)->lsm_magic == LOV_MAGIC_V1 ||                          \
+                 (lsmp)->lsm_magic == LOV_MAGIC_V3),                            \
+                 "%p->lsm_magic=%x\n", (lsmp), (lsmp)->lsm_magic);              \
+} while (0)
 
 static int lov_destroy(struct obd_export *exp, struct obdo *oa,
-                       struct lov_stripe_md *lsm, struct obd_trans_info *oti)
+                       struct lov_stripe_md *lsm, struct obd_trans_info *oti,
+                       struct obd_export *md_exp, void *capa)
 {
         struct lov_request_set *set;
+        struct obd_info oinfo;
         struct lov_request *req;
-        struct list_head *pos;
+        cfs_list_t *pos;
         struct lov_obd *lov;
-        int rc = 0;
+        int rc = 0, err = 0;
         ENTRY;
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
+        ASSERT_LSM_MAGIC(lsm);
 
         if (!exp || !exp->exp_obd)
                 RETURN(-ENODEV);
 
+        if (oa->o_valid & OBD_MD_FLCOOKIE) {
+                LASSERT(oti);
+                LASSERT(oti->oti_logcookies);
+        }
+
         lov = &exp->exp_obd->u.lov;
-        rc = lov_prep_destroy_set(exp, oa, lsm, oti, &set);
+        obd_getref(exp->exp_obd);
+        rc = lov_prep_destroy_set(exp, &oinfo, oa, lsm, oti, &set);
         if (rc)
-                RETURN(rc);
+                GOTO(out, rc);
 
-        list_for_each (pos, &set->set_list) {
-                int err;
-                req = list_entry(pos, struct lov_request, rq_link);
+        cfs_list_for_each (pos, &set->set_list) {
+                req = cfs_list_entry(pos, struct lov_request, rq_link);
 
-                /* XXX update the cookie position */
-                oti->oti_logcookies = set->set_cookies + req->rq_stripe;
-                rc = obd_destroy(lov->tgts[req->rq_idx].ltd_exp, req->rq_oa,
-                                 NULL, oti);
-                err = lov_update_common_set(set, req, rc);
-                if (rc) {
+                if (oa->o_valid & OBD_MD_FLCOOKIE)
+                        oti->oti_logcookies = set->set_cookies + req->rq_stripe;
+
+                err = obd_destroy(lov->lov_tgts[req->rq_idx]->ltd_exp,
+                                  req->rq_oi.oi_oa, NULL, oti, NULL, capa);
+                err = lov_update_common_set(set, req, err);
+                if (err) {
                         CERROR("error: destroying objid "LPX64" subobj "
-                               LPX64" on OST idx %d: rc = %d\n", 
-                               set->set_oa->o_id, req->rq_oa->o_id, 
-                               req->rq_idx, rc);
+                               LPX64" on OST idx %d: rc = %d\n",
+                               oa->o_id, req->rq_oi.oi_oa->o_id,
+                               req->rq_idx, err);
                         if (!rc)
                                 rc = err;
                 }
         }
-        lov_fini_destroy_set(set);
-        RETURN(rc);
+
+        if (rc == 0) {
+                LASSERT(lsm_op_find(lsm->lsm_magic) != NULL);
+                rc = lsm_op_find(lsm->lsm_magic)->lsm_destroy(lsm, oa, md_exp);
+        }
+        err = lov_fini_destroy_set(set);
+out:
+        obd_putref(exp->exp_obd);
+        RETURN(rc ? rc : err);
 }
 
-static int lov_getattr(struct obd_export *exp, struct obdo *oa,
-                       struct lov_stripe_md *lsm)
+static int lov_getattr(struct obd_export *exp, struct obd_info *oinfo)
 {
         struct lov_request_set *set;
         struct lov_request *req;
-        struct list_head *pos;
+        cfs_list_t *pos;
         struct lov_obd *lov;
         int err = 0, rc = 0;
         ENTRY;
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
+        LASSERT(oinfo);
+        ASSERT_LSM_MAGIC(oinfo->oi_md);
 
         if (!exp || !exp->exp_obd)
                 RETURN(-ENODEV);
 
         lov = &exp->exp_obd->u.lov;
-        
-        rc = lov_prep_getattr_set(exp, oa, lsm, &set);
+
+        rc = lov_prep_getattr_set(exp, oinfo, &set);
         if (rc)
                 RETURN(rc);
 
-        list_for_each (pos, &set->set_list) {
-                req = list_entry(pos, struct lov_request, rq_link);
-                
+        cfs_list_for_each (pos, &set->set_list) {
+                req = cfs_list_entry(pos, struct lov_request, rq_link);
+
                 CDEBUG(D_INFO, "objid "LPX64"[%d] has subobj "LPX64" at idx "
-                       "%u\n", oa->o_id, req->rq_stripe, req->rq_oa->o_id, 
-                       req->rq_idx);
+                       "%u\n", oinfo->oi_oa->o_id, req->rq_stripe,
+                       req->rq_oi.oi_oa->o_id, req->rq_idx);
 
-                rc = obd_getattr(lov->tgts[req->rq_idx].ltd_exp, 
-                                 req->rq_oa, NULL);
+                rc = obd_getattr(lov->lov_tgts[req->rq_idx]->ltd_exp,
+                                 &req->rq_oi);
                 err = lov_update_common_set(set, req, rc);
                 if (err) {
                         CERROR("error: getattr objid "LPX64" subobj "
                                LPX64" on OST idx %d: rc = %d\n",
-                               set->set_oa->o_id, req->rq_oa->o_id, 
+                               oinfo->oi_oa->o_id, req->rq_oi.oi_oa->o_id,
                                req->rq_idx, err);
                         break;
                 }
         }
-        
+
         rc = lov_fini_getattr_set(set);
         if (err)
                 rc = err;
         RETURN(rc);
 }
 
-static int lov_getattr_interpret(struct ptlrpc_request_set *rqset, void *data,
-                                 int rc)
+static int lov_getattr_interpret(struct ptlrpc_request_set *rqset,
+                                 void *data, int rc)
 {
         struct lov_request_set *lovset = (struct lov_request_set *)data;
+        int err;
         ENTRY;
 
         /* don't do attribute merge if this aysnc op failed */
-        if (rc) {
+        if (rc)
                 lovset->set_completes = 0;
-                lov_fini_getattr_set(lovset);
-        } else {
-                rc = lov_fini_getattr_set(lovset);
-        }
-        RETURN (rc);
+        err = lov_fini_getattr_set(lovset);
+        RETURN(rc ? rc : err);
 }
 
-static int lov_getattr_async(struct obd_export *exp, struct obdo *oa,
-                              struct lov_stripe_md *lsm,
+static int lov_getattr_async(struct obd_export *exp, struct obd_info *oinfo,
                               struct ptlrpc_request_set *rqset)
 {
         struct lov_request_set *lovset;
         struct lov_obd *lov;
-        struct list_head *pos;
+        cfs_list_t *pos;
         struct lov_request *req;
-        int rc = 0;
+        int rc = 0, err;
         ENTRY;
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
+        LASSERT(oinfo);
+        ASSERT_LSM_MAGIC(oinfo->oi_md);
 
         if (!exp || !exp->exp_obd)
                 RETURN(-ENODEV);
 
         lov = &exp->exp_obd->u.lov;
 
-        rc = lov_prep_getattr_set(exp, oa, lsm, &lovset);
+        rc = lov_prep_getattr_set(exp, oinfo, &lovset);
         if (rc)
                 RETURN(rc);
 
         CDEBUG(D_INFO, "objid "LPX64": %ux%u byte stripes\n",
-               lsm->lsm_object_id, lsm->lsm_stripe_count, lsm->lsm_stripe_size);
+               oinfo->oi_md->lsm_object_id, oinfo->oi_md->lsm_stripe_count,
+               oinfo->oi_md->lsm_stripe_size);
+
+        cfs_list_for_each (pos, &lovset->set_list) {
+                req = cfs_list_entry(pos, struct lov_request, rq_link);
 
-        list_for_each (pos, &lovset->set_list) {
-                req = list_entry(pos, struct lov_request, rq_link);
-                
                 CDEBUG(D_INFO, "objid "LPX64"[%d] has subobj "LPX64" at idx "
-                       "%u\n", oa->o_id, req->rq_stripe, req->rq_oa->o_id, 
-                       req->rq_idx);
-                rc = obd_getattr_async(lov->tgts[req->rq_idx].ltd_exp,
-                                       req->rq_oa, NULL, rqset);
+                       "%u\n", oinfo->oi_oa->o_id, req->rq_stripe,
+                       req->rq_oi.oi_oa->o_id, req->rq_idx);
+                rc = obd_getattr_async(lov->lov_tgts[req->rq_idx]->ltd_exp,
+                                       &req->rq_oi, rqset);
                 if (rc) {
                         CERROR("error: getattr objid "LPX64" subobj "
                                LPX64" on OST idx %d: rc = %d\n",
-                               lovset->set_oa->o_id, req->rq_oa->o_id, 
+                               oinfo->oi_oa->o_id, req->rq_oi.oi_oa->o_id,
                                req->rq_idx, rc);
                         GOTO(out, rc);
                 }
-                lov_update_common_set(lovset, req, rc);
         }
-        
-        LASSERT(rc == 0);
-        LASSERT (rqset->set_interpret == NULL);
-        rqset->set_interpret = lov_getattr_interpret;
-        rqset->set_arg = (void *)lovset;
-        RETURN(rc);
+
+        if (!cfs_list_empty(&rqset->set_requests)) {
+                LASSERT(rc == 0);
+                LASSERT (rqset->set_interpret == NULL);
+                rqset->set_interpret = lov_getattr_interpret;
+                rqset->set_arg = (void *)lovset;
+                RETURN(rc);
+        }
 out:
-        LASSERT(rc);
-        lov_fini_getattr_set(lovset);
-        RETURN(rc);
+        if (rc)
+                lovset->set_completes = 0;
+        err = lov_fini_getattr_set(lovset);
+        RETURN(rc ? rc : err);
 }
 
-static int lov_setattr(struct obd_export *exp, struct obdo *src_oa,
-                       struct lov_stripe_md *lsm, struct obd_trans_info *oti,
-                       struct lustre_capa *capa)
+static int lov_setattr(struct obd_export *exp, struct obd_info *oinfo,
+                       struct obd_trans_info *oti)
 {
         struct lov_request_set *set;
         struct lov_obd *lov;
-        struct list_head *pos;
+        cfs_list_t *pos;
         struct lov_request *req;
         int err = 0, rc = 0;
         ENTRY;
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
+        LASSERT(oinfo);
+        ASSERT_LSM_MAGIC(oinfo->oi_md);
 
         if (!exp || !exp->exp_obd)
                 RETURN(-ENODEV);
 
-        LASSERT(!(src_oa->o_valid & ~(OBD_MD_FLID|OBD_MD_FLTYPE | OBD_MD_FLMODE|
-                                      OBD_MD_FLATIME | OBD_MD_FLMTIME |
-                                      OBD_MD_FLCTIME | OBD_MD_FLFLAGS |
-                                      OBD_MD_FLSIZE | OBD_MD_FLGROUP |
-                                      OBD_MD_FLUID | OBD_MD_FLGID |
-                                      OBD_MD_FLINLINE | OBD_MD_FLIFID)));
-
-        LASSERT(!(src_oa->o_valid & OBD_MD_FLGROUP) || src_oa->o_gr > 0);
-
+        /* for now, we only expect the following updates here */
+        LASSERT(!(oinfo->oi_oa->o_valid & ~(OBD_MD_FLID | OBD_MD_FLTYPE |
+                                            OBD_MD_FLMODE | OBD_MD_FLATIME |
+                                            OBD_MD_FLMTIME | OBD_MD_FLCTIME |
+                                            OBD_MD_FLFLAGS | OBD_MD_FLSIZE |
+                                            OBD_MD_FLGROUP | OBD_MD_FLUID |
+                                            OBD_MD_FLGID | OBD_MD_FLFID |
+                                            OBD_MD_FLGENER)));
         lov = &exp->exp_obd->u.lov;
-        rc = lov_prep_setattr_set(exp, src_oa, lsm, NULL, &set);
+        rc = lov_prep_setattr_set(exp, oinfo, oti, &set);
         if (rc)
                 RETURN(rc);
 
-        list_for_each (pos, &set->set_list) {
-                req = list_entry(pos, struct lov_request, rq_link);
-                
-                rc = obd_setattr(lov->tgts[req->rq_idx].ltd_exp, req->rq_oa,
-                                 NULL, NULL, NULL);
-                err = lov_update_common_set(set, req, rc);
+        cfs_list_for_each (pos, &set->set_list) {
+                req = cfs_list_entry(pos, struct lov_request, rq_link);
+
+                rc = obd_setattr(lov->lov_tgts[req->rq_idx]->ltd_exp,
+                                 &req->rq_oi, NULL);
+                err = lov_update_setattr_set(set, req, rc);
                 if (err) {
                         CERROR("error: setattr objid "LPX64" subobj "
                                LPX64" on OST idx %d: rc = %d\n",
-                               set->set_oa->o_id, req->rq_oa->o_id,
-                               req->rq_idx, err);
+                               set->set_oi->oi_oa->o_id,
+                               req->rq_oi.oi_oa->o_id, req->rq_idx, err);
                         if (!rc)
                                 rc = err;
                 }
@@ -1043,188 +1389,189 @@ static int lov_setattr(struct obd_export *exp, struct obdo *src_oa,
         RETURN(rc);
 }
 
-static int lov_revalidate_policy(struct lov_obd *lov, struct lov_stripe_md *lsm)
+static int lov_setattr_interpret(struct ptlrpc_request_set *rqset,
+                                 void *data, int rc)
 {
-        static int next_idx = 0;
-        struct lov_tgt_desc *tgt;
-        int i, count;
+        struct lov_request_set *lovset = (struct lov_request_set *)data;
+        int err;
         ENTRY;
 
-        /* XXX - we should do something clever and take lsm
-         * into account but just do round robin for now. */
-
-        /* last_idx must always be less that count because
-         * ld_tgt_count currently cannot shrink. */
-        count = lov->desc.ld_tgt_count;
+        if (rc)
+                lovset->set_completes = 0;
+        err = lov_fini_setattr_set(lovset);
+        RETURN(rc ? rc : err);
+}
 
-        for (i = next_idx, tgt = lov->tgts + i; i < count; i++, tgt++) {
-                if (lov_tgt_active(lov, tgt, 0)) {
-                        next_idx = (i + 1) % count;
-                        RETURN(i);
-                }
-        }
+/* If @oti is given, the request goes from MDS and responses from OSTs are not
+   needed. Otherwise, a client is waiting for responses. */
+static int lov_setattr_async(struct obd_export *exp, struct obd_info *oinfo,
+                             struct obd_trans_info *oti,
+                             struct ptlrpc_request_set *rqset)
+{
+        struct lov_request_set *set;
+        struct lov_request *req;
+        cfs_list_t *pos;
+        struct lov_obd *lov;
+        int rc = 0;
+        ENTRY;
 
-        for (i = 0, tgt = lov->tgts; i < next_idx; i++, tgt++) {
-                if (lov_tgt_active(lov, tgt, 0)) {
-                        next_idx = (i + 1) % count;
-                        RETURN(i);
-                }
+        LASSERT(oinfo);
+        ASSERT_LSM_MAGIC(oinfo->oi_md);
+        if (oinfo->oi_oa->o_valid & OBD_MD_FLCOOKIE) {
+                LASSERT(oti);
+                LASSERT(oti->oti_logcookies);
         }
 
-        RETURN(-EIO);
-}
+        if (!exp || !exp->exp_obd)
+                RETURN(-ENODEV);
 
-static int lov_revalidate_md(struct obd_export *exp, struct obdo *src_oa,
-                             struct lov_stripe_md *ea,
-                             struct obd_trans_info *oti)
-{
-        struct obd_export *osc_exp;
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
-        struct lov_stripe_md *lsm = ea;
-        struct lov_stripe_md obj_md;
-        struct lov_stripe_md *obj_mdp = &obj_md;
-        struct lov_oinfo *loi;
-        struct obdo *tmp_oa;
-        int ost_idx, updates = 0, i;
-        ENTRY;
+        lov = &exp->exp_obd->u.lov;
+        rc = lov_prep_setattr_set(exp, oinfo, oti, &set);
+        if (rc)
+                RETURN(rc);
 
-        tmp_oa = obdo_alloc();
-        if (tmp_oa == NULL)
-                RETURN(-ENOMEM);
+        CDEBUG(D_INFO, "objid "LPX64": %ux%u byte stripes\n",
+               oinfo->oi_md->lsm_object_id, oinfo->oi_md->lsm_stripe_count,
+               oinfo->oi_md->lsm_stripe_size);
 
-        loi = lsm->lsm_oinfo;
-        for (i = 0; i < lsm->lsm_stripe_count; i++, loi++) {
-                struct lov_tgt_desc *tgt;
-                int rc;
+        cfs_list_for_each (pos, &set->set_list) {
+                req = cfs_list_entry(pos, struct lov_request, rq_link);
 
-                if (!lov_tgt_changed(lov, loi))
-                        continue;
+                if (oinfo->oi_oa->o_valid & OBD_MD_FLCOOKIE)
+                        oti->oti_logcookies = set->set_cookies + req->rq_stripe;
 
-                /* returns an active tgt. tgt->ltd_refcount is incremented. */
-                ost_idx = lov_revalidate_policy(lov, lsm);
-                if (ost_idx < 0) {
-                        /* FIXME: punt for now. */
-                        CERROR("lov_revalidate_policy failed; no active "
-                               "OSCs?\n");
-                        continue;
-                }
+                CDEBUG(D_INFO, "objid "LPX64"[%d] has subobj "LPX64" at idx "
+                       "%u\n", oinfo->oi_oa->o_id, req->rq_stripe,
+                       req->rq_oi.oi_oa->o_id, req->rq_idx);
 
-                /* create a new object */
-                memcpy(tmp_oa, src_oa, sizeof(*tmp_oa));
-                /* XXX: LOV STACKING: use real "obj_mdp" sub-data */
-                tgt = lov->tgts + ost_idx;
-                osc_exp = tgt->ltd_exp;
-                rc = obd_create(osc_exp, tmp_oa, NULL, 0, &obj_mdp, oti);
+                rc = obd_setattr_async(lov->lov_tgts[req->rq_idx]->ltd_exp,
+                                       &req->rq_oi, oti, rqset);
                 if (rc) {
-                        lov_tgt_decref(lov, tgt);
-                        CERROR("error creating new subobj at idx %d; "
-                               "rc = %d\n", ost_idx, rc);
-                        continue;
+                        CERROR("error: setattr objid "LPX64" subobj "
+                               LPX64" on OST idx %d: rc = %d\n",
+                               set->set_oi->oi_oa->o_id,
+                               req->rq_oi.oi_oa->o_id,
+                               req->rq_idx, rc);
+                        break;
                 }
+        }
+
+        /* If we are not waiting for responses on async requests, return. */
+        if (rc || !rqset || cfs_list_empty(&rqset->set_requests)) {
+                int err;
+                if (rc)
+                        set->set_completes = 0;
+                err = lov_fini_setattr_set(set);
+                RETURN(rc ? rc : err);
+        }
 
-                CDEBUG(D_INODE,
-                       "replacing idx %d gen %d objid "LPX64" subobj "LPX64" "
-                       "with idx %d gen %d objid "LPX64" subobj "LPX64".\n",
-                       loi->loi_ost_idx, loi->loi_ost_gen,
-                       loi->loi_id, loi->loi_gr,
-                       ost_idx, tgt->ltd_gen, tmp_oa->o_id, tmp_oa->o_gr);
-
-                if (oti->oti_objid)
-                        oti->oti_objid[ost_idx] = tmp_oa->o_id;
-                loi->loi_id = tmp_oa->o_id;
-                loi->loi_gr = tmp_oa->o_gr;
-                loi->loi_ost_idx = ost_idx;
-                loi->loi_ost_gen = tgt->ltd_gen;
-                lov_tgt_decref(lov, tgt);
-                updates = 1;
-        }
-
-        /* If we got an error revalidating an entry there's no need to
-         * cleanup up objects we allocated here because the bad entry
-         * still points to a deleted OST. */
-
-        obdo_free(tmp_oa);
-        RETURN(updates);
+        LASSERT(rqset->set_interpret == NULL);
+        rqset->set_interpret = lov_setattr_interpret;
+        rqset->set_arg = (void *)set;
+
+        RETURN(0);
+}
+
+static int lov_punch_interpret(struct ptlrpc_request_set *rqset,
+                               void *data, int rc)
+{
+        struct lov_request_set *lovset = (struct lov_request_set *)data;
+        int err;
+        ENTRY;
+
+        if (rc)
+                lovset->set_completes = 0;
+        err = lov_fini_punch_set(lovset);
+        RETURN(rc ? rc : err);
 }
 
 /* FIXME: maybe we'll just make one node the authoritative attribute node, then
  * we can send this 'punch' to just the authoritative node and the nodes
  * that the punch will affect. */
-static int lov_punch(struct obd_export *exp, struct obdo *oa,
-                     struct lov_stripe_md *lsm, obd_off start,
-                     obd_off end, struct obd_trans_info *oti,
-                     struct lustre_capa *capa)
+static int lov_punch(struct obd_export *exp, struct obd_info *oinfo,
+                     struct obd_trans_info *oti,
+                     struct ptlrpc_request_set *rqset)
 {
         struct lov_request_set *set;
         struct lov_obd *lov;
-        struct list_head *pos;
+        cfs_list_t *pos;
         struct lov_request *req;
-        int err = 0, rc = 0;
+        int rc = 0;
         ENTRY;
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
+        LASSERT(oinfo);
+        ASSERT_LSM_MAGIC(oinfo->oi_md);
 
         if (!exp || !exp->exp_obd)
                 RETURN(-ENODEV);
 
         lov = &exp->exp_obd->u.lov;
-        rc = lov_prep_punch_set(exp, oa, lsm, start, end, oti, &set);
+        rc = lov_prep_punch_set(exp, oinfo, oti, &set);
         if (rc)
                 RETURN(rc);
 
-        list_for_each (pos, &set->set_list) {
-                req = list_entry(pos, struct lov_request, rq_link);
+        cfs_list_for_each (pos, &set->set_list) {
+                req = cfs_list_entry(pos, struct lov_request, rq_link);
 
-                rc = obd_punch(lov->tgts[req->rq_idx].ltd_exp, req->rq_oa, 
-                               NULL, req->rq_extent.start, 
-                               req->rq_extent.end, NULL, capa);
-                err = lov_update_punch_set(set, req, rc);
-                if (err) {
+                rc = obd_punch(lov->lov_tgts[req->rq_idx]->ltd_exp,
+                               &req->rq_oi, NULL, rqset);
+                if (rc) {
                         CERROR("error: punch objid "LPX64" subobj "LPX64
-                               " on OST idx %d: rc = %d\n", set->set_oa->o_id,
-                               req->rq_oa->o_id, req->rq_idx, rc);
-                        if (!rc)
-                                rc = err;
+                               " on OST idx %d: rc = %d\n",
+                               set->set_oi->oi_oa->o_id,
+                               req->rq_oi.oi_oa->o_id, req->rq_idx, rc);
+                        break;
                 }
         }
-        err = lov_fini_punch_set(set);
-        if (!rc)
-                rc = err;
-        RETURN(rc);
+
+        if (rc || cfs_list_empty(&rqset->set_requests)) {
+                int err;
+                err = lov_fini_punch_set(set);
+                RETURN(rc ? rc : err);
+        }
+
+        LASSERT(rqset->set_interpret == NULL);
+        rqset->set_interpret = lov_punch_interpret;
+        rqset->set_arg = (void *)set;
+
+        RETURN(0);
 }
 
 static int lov_sync(struct obd_export *exp, struct obdo *oa,
-                    struct lov_stripe_md *lsm, obd_off start, obd_off end)
+                    struct lov_stripe_md *lsm, obd_off start, obd_off end,
+                    void *capa)
 {
         struct lov_request_set *set;
+        struct obd_info oinfo;
         struct lov_obd *lov;
-        struct list_head *pos;
+        cfs_list_t *pos;
         struct lov_request *req;
         int err = 0, rc = 0;
         ENTRY;
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
+        ASSERT_LSM_MAGIC(lsm);
 
         if (!exp->exp_obd)
                 RETURN(-ENODEV);
 
         lov = &exp->exp_obd->u.lov;
-        rc = lov_prep_sync_set(exp, oa, lsm, start, end, &set);
+        rc = lov_prep_sync_set(exp, &oinfo, oa, lsm, start, end, &set);
         if (rc)
                 RETURN(rc);
 
-        list_for_each (pos, &set->set_list) {
-                req = list_entry(pos, struct lov_request, rq_link);
+        cfs_list_for_each (pos, &set->set_list) {
+                req = cfs_list_entry(pos, struct lov_request, rq_link);
 
-                rc = obd_sync(lov->tgts[req->rq_idx].ltd_exp, req->rq_oa, 
-                              NULL, req->rq_extent.start, req->rq_extent.end);
+                rc = obd_sync(lov->lov_tgts[req->rq_idx]->ltd_exp,
+                              req->rq_oi.oi_oa, NULL,
+                              req->rq_oi.oi_policy.l_extent.start,
+                              req->rq_oi.oi_policy.l_extent.end, capa);
                 err = lov_update_common_set(set, req, rc);
                 if (err) {
                         CERROR("error: fsync objid "LPX64" subobj "LPX64
-                               " on OST idx %d: rc = %d\n", set->set_oa->o_id,
-                               req->rq_oa->o_id, req->rq_idx, rc);
+                               " on OST idx %d: rc = %d\n",
+                               set->set_oi->oi_oa->o_id,
+                               req->rq_oi.oi_oa->o_id, req->rq_idx, rc);
                         if (!rc)
                                 rc = err;
                 }
@@ -1235,75 +1582,70 @@ static int lov_sync(struct obd_export *exp, struct obdo *oa,
         RETURN(rc);
 }
 
-static int lov_brw_check(struct lov_obd *lov, struct obdo *oa,
-                         struct lov_stripe_md *lsm,
+static int lov_brw_check(struct lov_obd *lov, struct obd_info *lov_oinfo,
                          obd_count oa_bufs, struct brw_page *pga)
 {
+        struct obd_info oinfo = { { { 0 } } };
         int i, rc = 0;
-        ENTRY;
+
+        oinfo.oi_oa = lov_oinfo->oi_oa;
 
         /* The caller just wants to know if there's a chance that this
          * I/O can succeed */
         for (i = 0; i < oa_bufs; i++) {
-                struct lov_oinfo *loi;
-                struct lov_tgt_desc *tgt;
-                int stripe;
+                int stripe = lov_stripe_number(lov_oinfo->oi_md, pga[i].off);
+                int ost = lov_oinfo->oi_md->lsm_oinfo[stripe]->loi_ost_idx;
                 obd_off start, end;
 
-                if (!lov_stripe_intersects(lsm, i, pga[i].disk_offset,
-                                           pga[i].disk_offset + pga[i].count,
+                if (!lov_stripe_intersects(lov_oinfo->oi_md, i, pga[i].off,
+                                           pga[i].off + pga[i].count - 1,
                                            &start, &end))
                         continue;
 
-                stripe = lov_stripe_number(lsm, pga[i].disk_offset);
-                loi = lsm->lsm_oinfo + stripe;
-                tgt = lov->tgts + loi->loi_ost_idx;
-
-                if (!lov_tgt_ready(lov, tgt, loi->loi_ost_gen)) {
-                        CDEBUG(D_HA, "lov idx %d inactive\n", loi->loi_ost_idx);
-                        RETURN(-EIO);
+                if (!lov->lov_tgts[ost] || !lov->lov_tgts[ost]->ltd_active) {
+                        CDEBUG(D_HA, "lov idx %d inactive\n", ost);
+                        return -EIO;
                 }
-                rc = obd_brw(OBD_BRW_CHECK, tgt->ltd_exp, oa,
-                             NULL, 1, &pga[i], NULL);
-                lov_tgt_decref(lov, tgt);
+
+                rc = obd_brw(OBD_BRW_CHECK, lov->lov_tgts[ost]->ltd_exp, &oinfo,
+                             1, &pga[i], NULL);
                 if (rc)
                         break;
         }
-        RETURN(rc);
+        return rc;
 }
 
-static int lov_brw(int cmd, struct obd_export *exp, struct obdo *src_oa,
-                   struct lov_stripe_md *lsm, obd_count oa_bufs,
-                   struct brw_page *pga, struct obd_trans_info *oti)
+static int lov_brw(int cmd, struct obd_export *exp, struct obd_info *oinfo,
+                   obd_count oa_bufs, struct brw_page *pga,
+                   struct obd_trans_info *oti)
 {
         struct lov_request_set *set;
         struct lov_request *req;
-        struct list_head *pos;
+        cfs_list_t *pos;
         struct lov_obd *lov = &exp->exp_obd->u.lov;
         int err, rc = 0;
         ENTRY;
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
+        ASSERT_LSM_MAGIC(oinfo->oi_md);
 
         if (cmd == OBD_BRW_CHECK) {
-                rc = lov_brw_check(lov, src_oa, lsm, oa_bufs, pga);
+                rc = lov_brw_check(lov, oinfo, oa_bufs, pga);
                 RETURN(rc);
         }
 
-        rc = lov_prep_brw_set(exp, src_oa, lsm, oa_bufs, pga, oti, &set);
+        rc = lov_prep_brw_set(exp, oinfo, oa_bufs, pga, oti, &set);
         if (rc)
                 RETURN(rc);
 
-        list_for_each (pos, &set->set_list) {
+        cfs_list_for_each (pos, &set->set_list) {
                 struct obd_export *sub_exp;
                 struct brw_page *sub_pga;
-                req = list_entry(pos, struct lov_request, rq_link);
-                
-                sub_exp = lov->tgts[req->rq_idx].ltd_exp;
+                req = cfs_list_entry(pos, struct lov_request, rq_link);
+
+                sub_exp = lov->lov_tgts[req->rq_idx]->ltd_exp;
                 sub_pga = set->set_pga + req->rq_pgaidx;
-                rc = obd_brw(cmd, sub_exp, req->rq_oa, req->rq_md, 
-                             req->rq_oabufs, sub_pga, oti);
+                rc = obd_brw(cmd, sub_exp, &req->rq_oi, req->rq_oabufs,
+                             sub_pga, oti);
                 if (rc)
                         break;
                 lov_update_common_set(set, req, rc);
@@ -1315,432 +1657,60 @@ static int lov_brw(int cmd, struct obd_export *exp, struct obdo *src_oa,
         RETURN(rc);
 }
 
-static int lov_brw_interpret(struct ptlrpc_request_set *reqset, void *data,
-                             int rc)
+static int lov_enqueue_interpret(struct ptlrpc_request_set *rqset,
+                                 void *data, int rc)
 {
         struct lov_request_set *lovset = (struct lov_request_set *)data;
         ENTRY;
-        
-        if (rc) {
-                lovset->set_completes = 0;
-                lov_fini_brw_set(lovset);
-        } else {
-                rc = lov_fini_brw_set(lovset);
-        }
-                
-        RETURN(rc);
-}
-
-static int lov_brw_async(int cmd, struct obd_export *exp, struct obdo *oa,
-                         struct lov_stripe_md *lsm, obd_count oa_bufs,
-                         struct brw_page *pga, struct ptlrpc_request_set *set,
-                         struct obd_trans_info *oti)
-{
-        struct lov_request_set *lovset;
-        struct lov_request *req;
-        struct list_head *pos;
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
-        int rc = 0;
-        ENTRY;
-
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
-
-        if (cmd == OBD_BRW_CHECK) {
-                rc = lov_brw_check(lov, oa, lsm, oa_bufs, pga);
-                RETURN(rc);
-        }
-
-        rc = lov_prep_brw_set(exp, oa, lsm, oa_bufs, pga, oti, &lovset);
-        if (rc)
-                RETURN(rc);
-
-        list_for_each (pos, &lovset->set_list) {
-                struct obd_export *sub_exp;
-                struct brw_page *sub_pga;
-                req = list_entry(pos, struct lov_request, rq_link);
-                
-                sub_exp = lov->tgts[req->rq_idx].ltd_exp;
-                sub_pga = lovset->set_pga + req->rq_pgaidx;
-                rc = obd_brw_async(cmd, sub_exp, req->rq_oa, req->rq_md,
-                                   req->rq_oabufs, sub_pga, set, oti);
-                if (rc)
-                        GOTO(out, rc);
-                lov_update_common_set(lovset, req, rc);
-        }
-        LASSERT(rc == 0);
-        LASSERT(set->set_interpret == NULL);
-        set->set_interpret = (set_interpreter_func)lov_brw_interpret;
-        set->set_arg = (void *)lovset;
-        
-        RETURN(rc);
-out:
-        lov_fini_brw_set(lovset);
-        RETURN(rc);
-}
-
-static int lov_ap_make_ready(void *data, int cmd)
-{
-        struct lov_async_page *lap = LAP_FROM_COOKIE(data);
-
-        return lap->lap_caller_ops->ap_make_ready(lap->lap_caller_data, cmd);
-}
-static int lov_ap_refresh_count(void *data, int cmd)
-{
-        struct lov_async_page *lap = LAP_FROM_COOKIE(data);
-
-        return lap->lap_caller_ops->ap_refresh_count(lap->lap_caller_data,
-                                                     cmd);
-}
-static void lov_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
-{
-        struct lov_async_page *lap = LAP_FROM_COOKIE(data);
-
-        lap->lap_caller_ops->ap_fill_obdo(lap->lap_caller_data, cmd, oa);
-        /* XXX woah, shouldn't we be altering more here?  size? */
-        oa->o_id = lap->lap_loi_id;
-}
-
-static void lov_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
-{
-        struct lov_async_page *lap = LAP_FROM_COOKIE(data);
-
-        /* in a raid1 regime this would down a count of many ios
-         * in flight, onl calling the caller_ops completion when all
-         * the raid1 ios are complete */
-        lap->lap_caller_ops->ap_completion(lap->lap_caller_data, cmd, oa, rc);
-}
-
-static struct obd_async_page_ops lov_async_page_ops = {
-        .ap_make_ready =        lov_ap_make_ready,
-        .ap_refresh_count =     lov_ap_refresh_count,
-        .ap_fill_obdo =         lov_ap_fill_obdo,
-        .ap_completion =        lov_ap_completion,
-};
-
-static int lov_prep_async_page(struct obd_export *exp,
-                               struct lov_stripe_md *lsm,
-                               struct lov_oinfo *loi, struct page *page,
-                               obd_off offset, struct obd_async_page_ops *ops,
-                               void *data, void **res)
-{
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
-        struct lov_tgt_desc *tgt;
-        struct lov_async_page *lap;
-        int rc, stripe;
-        ENTRY;
-
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
-        LASSERT(loi == NULL);
-
-        stripe = lov_stripe_number(lsm, offset);
-        loi = &lsm->lsm_oinfo[stripe];
-
-        OBD_ALLOC(lap, sizeof(*lap));
-        if (lap == NULL)
-                RETURN(-ENOMEM);
-
-        lap->lap_magic = LAP_MAGIC;
-        lap->lap_caller_ops = ops;
-        lap->lap_caller_data = data;
-
-        /* FIXME handle multiple oscs after landing b_raid1 */
-        lap->lap_stripe = stripe;
-        switch (lsm->lsm_pattern) {
-                case LOV_PATTERN_RAID0:
-                        lov_stripe_offset(lsm, offset, lap->lap_stripe, 
-                                          &lap->lap_sub_offset);
-                        break;
-                case LOV_PATTERN_CMOBD:
-                        lap->lap_sub_offset = offset;
-                        break;
-                default:
-                        LBUG();
-        }
-
-        /* so the callback doesn't need the lsm */
-        lap->lap_loi_id = loi->loi_id;
-
-        tgt = lov->tgts + loi->loi_ost_idx;
-
-        if (lov_tgt_ready(lov, tgt, loi->loi_ost_gen)) {
-                rc = obd_prep_async_page(tgt->ltd_exp, lsm, loi, page,
-                                         lap->lap_sub_offset,
-                                         &lov_async_page_ops, lap,
-                                         &lap->lap_sub_cookie);
-                lov_tgt_decref(lov, tgt);
-        } else {
-                rc = -EIO;
-        }
-
-        if (rc) {
-                OBD_FREE(lap, sizeof(*lap));
-                RETURN(rc);
-        }
-        CDEBUG(D_CACHE, "lap %p page %p cookie %p off "LPU64"\n", lap, page,
-               lap->lap_sub_cookie, offset);
-        *res = lap;
-        RETURN(0);
-}
-
-static int lov_queue_async_io(struct obd_export *exp,
-                              struct lov_stripe_md *lsm,
-                              struct lov_oinfo *loi, void *cookie,
-                              int cmd, obd_off off, int count,
-                              obd_flags brw_flags, obd_flags async_flags)
-{
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
-        struct lov_tgt_desc *tgt;
-        struct lov_async_page *lap;
-        int rc;
-
-        LASSERT(loi == NULL);
-
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
-
-        lap = LAP_FROM_COOKIE(cookie);
-        loi = &lsm->lsm_oinfo[lap->lap_stripe];
-        tgt = lov->tgts + loi->loi_ost_idx;
-
-        if (!lov_tgt_valid(lov, tgt, loi->loi_ost_gen))
-                RETURN(-EIO);
-        
-        rc = obd_queue_async_io(tgt->ltd_exp, lsm, loi, lap->lap_sub_cookie,
-                                cmd, off, count, brw_flags, async_flags);
-
-        lov_tgt_decref(lov, tgt);
-        RETURN(rc);
-}
-
-static int lov_set_async_flags(struct obd_export *exp,
-                               struct lov_stripe_md *lsm,
-                               struct lov_oinfo *loi, void *cookie,
-                               obd_flags async_flags)
-{
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
-        struct lov_tgt_desc *tgt;
-        struct lov_async_page *lap;
-        int rc;
-
-        LASSERT(loi == NULL);
-
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
-
-        lap = LAP_FROM_COOKIE(cookie);
-        loi = &lsm->lsm_oinfo[lap->lap_stripe];
-        tgt = lov->tgts + loi->loi_ost_idx;
-
-        if (!lov_tgt_ready(lov, tgt, loi->loi_ost_gen)) 
-                 RETURN(-EIO);
-        
-        rc = obd_set_async_flags(tgt->ltd_exp, lsm, loi, lap->lap_sub_cookie,
-                                 async_flags);
-
-        lov_tgt_decref(lov, tgt);
-        RETURN(rc);
-}
-
-static int lov_queue_group_io(struct obd_export *exp,
-                              struct lov_stripe_md *lsm,
-                              struct lov_oinfo *loi,
-                              struct obd_io_group *oig, void *cookie,
-                              int cmd, obd_off off, int count,
-                              obd_flags brw_flags, obd_flags async_flags)
-{
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
-        struct lov_tgt_desc *tgt;
-        struct lov_async_page *lap;
-        int rc;
-
-        LASSERT(loi == NULL);
-
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
-
-        lap = LAP_FROM_COOKIE(cookie);
-        loi = &lsm->lsm_oinfo[lap->lap_stripe];
-        tgt = lov->tgts + loi->loi_ost_idx;
-
-        if (!lov_tgt_valid(lov, tgt, loi->loi_ost_gen))
-                RETURN(-EIO);
-
-        rc = obd_queue_group_io(tgt->ltd_exp, lsm, loi, oig,
-                                lap->lap_sub_cookie, cmd, off, count,
-                                brw_flags, async_flags);
-
-        lov_tgt_decref(lov, tgt);
-        RETURN(rc);
-}
-
-/* this isn't exactly optimal.  we may have queued sync io in oscs on
- * all stripes, but we don't record that fact at queue time.  so we
- * trigger sync io on all stripes. */
-static int lov_trigger_group_io(struct obd_export *exp,
-                                struct lov_stripe_md *lsm,
-                                struct lov_oinfo *loi,
-                                struct obd_io_group *oig)
-{
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
-        int rc = 0, i, err;
-
-        LASSERT(loi == NULL);
-
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
-
-        loi = lsm->lsm_oinfo;
-        for (i = 0; i < lsm->lsm_stripe_count; i++, loi++) {
-                struct lov_tgt_desc *tgt = lov->tgts + loi->loi_ost_idx;
-
-                if (!lov_tgt_ready(lov, tgt, loi->loi_ost_gen)) {
-                        CDEBUG(D_HA, "lov idx %d inactive\n", loi->loi_ost_idx);
-                        continue;
-                }
-
-                err = obd_trigger_group_io(tgt->ltd_exp, lsm, loi, oig);
-
-                lov_tgt_decref(lov, tgt);
-
-                if (rc == 0 && err != 0)
-                        rc = err;
-        };
-        RETURN(rc);
-}
-
-static int lov_teardown_async_page(struct obd_export *exp,
-                                   struct lov_stripe_md *lsm,
-                                   struct lov_oinfo *loi, void *cookie)
-{
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
-        struct lov_tgt_desc *tgt;
-        struct lov_async_page *lap;
-        int rc;
-        ENTRY;
-
-        LASSERT(loi == NULL);
-
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
-
-        lap = LAP_FROM_COOKIE(cookie);
-
-        loi = &lsm->lsm_oinfo[lap->lap_stripe];
-        tgt = lov->tgts + loi->loi_ost_idx;
-
-        /* FIXME: this leaks the page, but it should never really happen.
-         *        Should we make this an LBUG() ? */
-        if (!lov_tgt_valid(lov, tgt, loi->loi_ost_gen)) {
-                CERROR("page found with invalid OSC !");
-                RETURN(-EIO);
-        }
-
-        rc = obd_teardown_async_page(tgt->ltd_exp, lsm, loi,
-                                     lap->lap_sub_cookie);
-        lov_tgt_decref(lov, tgt);
-
-        if (rc) {
-                CERROR("unable to teardown sub cookie %p: %d\n",
-                       lap->lap_sub_cookie, rc);
-                RETURN(rc);
-        }
-        OBD_FREE(lap, sizeof(*lap));
+        rc = lov_fini_enqueue_set(lovset, lovset->set_ei->ei_mode, rc, rqset);
         RETURN(rc);
 }
 
-static int lov_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm,
-                       __u32 type, ldlm_policy_data_t *policy, __u32 mode,
-                       int *flags, void *bl_cb, void *cp_cb, void *gl_cb,
-                       void *data,__u32 lvb_len, void *lvb_swabber,
-                       struct lustre_handle *lockh)
+static int lov_enqueue(struct obd_export *exp, struct obd_info *oinfo,
+                       struct ldlm_enqueue_info *einfo,
+                       struct ptlrpc_request_set *rqset)
 {
+        ldlm_mode_t mode = einfo->ei_mode;
         struct lov_request_set *set;
         struct lov_request *req;
-        struct list_head *pos;
-        struct lustre_handle *lov_lockhp;
+        cfs_list_t *pos;
         struct lov_obd *lov;
         ldlm_error_t rc;
-        int save_flags = *flags;
         ENTRY;
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
+        LASSERT(oinfo);
+        ASSERT_LSM_MAGIC(oinfo->oi_md);
+        LASSERT(mode == (mode & -mode));
 
         /* we should never be asked to replay a lock this way. */
-        LASSERT((*flags & LDLM_FL_REPLAY) == 0);
+        LASSERT((oinfo->oi_flags & LDLM_FL_REPLAY) == 0);
 
         if (!exp || !exp->exp_obd)
                 RETURN(-ENODEV);
 
         lov = &exp->exp_obd->u.lov;
-        rc = lov_prep_enqueue_set(exp, lsm, policy, mode, lockh, &set);
+        rc = lov_prep_enqueue_set(exp, oinfo, einfo, &set);
         if (rc)
                 RETURN(rc);
 
-        list_for_each (pos, &set->set_list) {
-                ldlm_policy_data_t sub_policy;
-                req = list_entry(pos, struct lov_request, rq_link);
-                lov_lockhp = set->set_lockh->llh_handles + req->rq_stripe;
-                LASSERT(lov_lockhp);
-
-                *flags = save_flags;
-                sub_policy.l_extent = req->rq_extent;
+        cfs_list_for_each (pos, &set->set_list) {
+                req = cfs_list_entry(pos, struct lov_request, rq_link);
 
-                rc = obd_enqueue(lov->tgts[req->rq_idx].ltd_exp, req->rq_md,
-                                 type, &sub_policy, mode, flags, bl_cb,
-                                 cp_cb, gl_cb, data, lvb_len, lvb_swabber,
-                                 lov_lockhp);
-                rc = lov_update_enqueue_set(set, req, rc, save_flags);
+                rc = obd_enqueue(lov->lov_tgts[req->rq_idx]->ltd_exp,
+                                 &req->rq_oi, einfo, rqset);
                 if (rc != ELDLM_OK)
-                        break;
+                        GOTO(out, rc);
         }
 
-        lov_fini_enqueue_set(set, mode);
-        RETURN(rc);
-}
-
-static int lov_match(struct obd_export *exp, struct lov_stripe_md *lsm,
-                     __u32 type, ldlm_policy_data_t *policy, __u32 mode,
-                     int *flags, void *data, struct lustre_handle *lockh)
-{
-        struct lov_request_set *set;
-        struct lov_request *req;
-        struct list_head *pos;
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
-        struct lustre_handle *lov_lockhp;
-        int lov_flags, rc = 0;
-        ENTRY;
-
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
-
-        if (!exp || !exp->exp_obd)
-                RETURN(-ENODEV);
-
-        lov = &exp->exp_obd->u.lov;
-        rc = lov_prep_match_set(exp, lsm, policy, mode, lockh, &set);
-        if (rc)
+        if (rqset && !cfs_list_empty(&rqset->set_requests)) {
+                LASSERT(rc == 0);
+                LASSERT(rqset->set_interpret == NULL);
+                rqset->set_interpret = lov_enqueue_interpret;
+                rqset->set_arg = (void *)set;
                 RETURN(rc);
-
-        list_for_each (pos, &set->set_list) {
-                ldlm_policy_data_t sub_policy;
-                req = list_entry(pos, struct lov_request, rq_link);
-                lov_lockhp = set->set_lockh->llh_handles + req->rq_stripe;
-                LASSERT(lov_lockhp);
-
-                sub_policy.l_extent = req->rq_extent;
-                lov_flags = *flags;
-
-                rc = obd_match(lov->tgts[req->rq_idx].ltd_exp, req->rq_md,
-                               type, &sub_policy, mode, &lov_flags, data,
-                               lov_lockhp);
-                rc = lov_update_match_set(set, req, rc);
-                if (rc != 1)
-                        break;
         }
-        lov_fini_match_set(set, mode, *flags);
+out:
+        rc = lov_fini_enqueue_set(set, mode, rc, rqset);
         RETURN(rc);
 }
 
@@ -1749,33 +1719,31 @@ static int lov_change_cbdata(struct obd_export *exp,
                              void *data)
 {
         struct lov_obd *lov;
-        struct lov_oinfo *loi;
         int rc = 0, i;
         ENTRY;
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
+        ASSERT_LSM_MAGIC(lsm);
 
         if (!exp || !exp->exp_obd)
                 RETURN(-ENODEV);
 
-        LASSERT(lsm->lsm_object_gr > 0);
+        LASSERT_MDS_GROUP(lsm->lsm_object_gr);
 
         lov = &exp->exp_obd->u.lov;
-        for (i = 0,loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++,loi++) {
-                struct lov_tgt_desc *tgt = lov->tgts + loi->loi_ost_idx;
+        for (i = 0; i < lsm->lsm_stripe_count; i++) {
                 struct lov_stripe_md submd;
+                struct lov_oinfo *loi = lsm->lsm_oinfo[i];
+
+                if (!lov->lov_tgts[loi->loi_ost_idx]) {
+                        CDEBUG(D_HA, "lov idx %d NULL \n", loi->loi_ost_idx);
+                        continue;
+                }
 
                 submd.lsm_object_id = loi->loi_id;
                 submd.lsm_object_gr = lsm->lsm_object_gr;
                 submd.lsm_stripe_count = 0;
-
-                if (!lov_tgt_valid(lov, tgt, loi->loi_ost_gen)) {
-                        CDEBUG(D_HA, "lov idx %d invalid.\n", loi->loi_ost_idx);
-                        continue;
-                }
-                rc = obd_change_cbdata(tgt->ltd_exp, &submd, it, data);
-                lov_tgt_decref(lov, tgt);
+                rc = obd_change_cbdata(lov->lov_tgts[loi->loi_ost_idx]->ltd_exp,
+                                       &submd, it, data);
         }
         RETURN(rc);
 }
@@ -1784,205 +1752,182 @@ static int lov_cancel(struct obd_export *exp, struct lov_stripe_md *lsm,
                       __u32 mode, struct lustre_handle *lockh)
 {
         struct lov_request_set *set;
+        struct obd_info oinfo;
         struct lov_request *req;
-        struct list_head *pos;
-        struct lov_obd *lov = &exp->exp_obd->u.lov;
+        cfs_list_t *pos;
+        struct lov_obd *lov;
         struct lustre_handle *lov_lockhp;
         int err = 0, rc = 0;
         ENTRY;
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
+        ASSERT_LSM_MAGIC(lsm);
 
         if (!exp || !exp->exp_obd)
                 RETURN(-ENODEV);
 
-        LASSERT(lsm->lsm_object_gr > 0);
-
+        LASSERT_MDS_GROUP(lsm->lsm_object_gr);
         LASSERT(lockh);
         lov = &exp->exp_obd->u.lov;
-        rc = lov_prep_cancel_set(exp, lsm, mode, lockh, &set);
+        rc = lov_prep_cancel_set(exp, &oinfo, lsm, mode, lockh, &set);
         if (rc)
                 RETURN(rc);
 
-        list_for_each (pos, &set->set_list) {
-                req = list_entry(pos, struct lov_request, rq_link);
+        cfs_list_for_each (pos, &set->set_list) {
+                req = cfs_list_entry(pos, struct lov_request, rq_link);
                 lov_lockhp = set->set_lockh->llh_handles + req->rq_stripe;
 
-                rc = obd_cancel(lov->tgts[req->rq_idx].ltd_exp, req->rq_md,
-                                mode, lov_lockhp);
+                rc = obd_cancel(lov->lov_tgts[req->rq_idx]->ltd_exp,
+                                req->rq_oi.oi_md, mode, lov_lockhp);
                 rc = lov_update_common_set(set, req, rc);
                 if (rc) {
                         CERROR("error: cancel objid "LPX64" subobj "
                                LPX64" on OST idx %d: rc = %d\n",
                                lsm->lsm_object_id,
-                               req->rq_md->lsm_object_id, req->rq_idx, rc);
+                               req->rq_oi.oi_md->lsm_object_id,
+                               req->rq_idx, rc);
                         err = rc;
                 }
+
         }
         lov_fini_cancel_set(set);
         RETURN(err);
 }
 
 static int lov_cancel_unused(struct obd_export *exp,
-                             struct lov_stripe_md *lsm, 
-                            int flags, void *opaque)
+                             struct lov_stripe_md *lsm,
+                             int flags, void *opaque)
 {
         struct lov_obd *lov;
-        struct lov_oinfo *loi;
-        struct lov_tgt_desc *tgt;
         int rc = 0, i;
         ENTRY;
 
+        if (!exp || !exp->exp_obd)
+                RETURN(-ENODEV);
+
         lov = &exp->exp_obd->u.lov;
         if (lsm == NULL) {
-                tgt = lov->tgts;
-                for (i = 0; i < lov->desc.ld_tgt_count; i++, tgt++) {
+                for (i = 0; i < lov->desc.ld_tgt_count; i++) {
                         int err;
+                        if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_exp)
+                                continue;
 
-                        if (lov_tgt_ready(lov, tgt, 0)) {
-                                err = obd_cancel_unused(tgt->ltd_exp, NULL,
-                                                        flags, opaque);
-                                lov_tgt_decref(lov, tgt);
-                        } else {
-                                if (obd_uuid_empty(&tgt->uuid))
-                                        continue;
-                                CERROR("error: cancel unused "
-                                       "OST idx %d: OST inactive.\n", i);
-                                err = -EIO;
-                        }
+                        err = obd_cancel_unused(lov->lov_tgts[i]->ltd_exp, NULL,
+                                                flags, opaque);
                         if (!rc)
                                 rc = err;
                 }
                 RETURN(rc);
         }
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
-
-        if (!exp || !exp->exp_obd)
-                RETURN(-ENODEV);
-
-        LASSERT(lsm->lsm_object_gr > 0);
+        ASSERT_LSM_MAGIC(lsm);
 
-        for (i = 0,loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++,loi++) {
+        LASSERT_MDS_GROUP(lsm->lsm_object_gr);
+        for (i = 0; i < lsm->lsm_stripe_count; i++) {
                 struct lov_stripe_md submd;
+                struct lov_oinfo *loi = lsm->lsm_oinfo[i];
                 int err;
 
+                if (!lov->lov_tgts[loi->loi_ost_idx]) {
+                        CDEBUG(D_HA, "lov idx %d NULL\n", loi->loi_ost_idx);
+                        continue;
+                }
+
+                if (!lov->lov_tgts[loi->loi_ost_idx]->ltd_active)
+                        CDEBUG(D_HA, "lov idx %d inactive\n", loi->loi_ost_idx);
+
                 submd.lsm_object_id = loi->loi_id;
                 submd.lsm_object_gr = lsm->lsm_object_gr;
                 submd.lsm_stripe_count = 0;
-
-                tgt = lov->tgts + loi->loi_ost_idx;
-                if (lov_tgt_ready(lov, tgt, loi->loi_ost_gen)) {
-                        err = obd_cancel_unused(tgt->ltd_exp, &submd, flags,
-                                                opaque);
-                        lov_tgt_decref(lov, tgt);
-                        if (err && lov_tgt_ready(lov, tgt, loi->loi_ost_gen)) {
-                                lov_tgt_decref(lov, tgt);
-                                CERROR("error: cancel unused objid "LPX64" "
-                                       "subobj "LPX64" OST idx %d: rc = %d\n",
-                                       lsm->lsm_object_id, loi->loi_id,
-                                       loi->loi_ost_idx, err);
-                        }
-                } else {
-                        err = -EIO;
-                        CERROR("error: cancel unused objid "LPX64" "
-                               "subobj "LPX64" on OST idx %d: OST inactive.\n",
-                               lsm->lsm_object_id,
-                               loi->loi_id, loi->loi_ost_idx);
+                err = obd_cancel_unused(lov->lov_tgts[loi->loi_ost_idx]->ltd_exp,
+                                        &submd, flags, opaque);
+                if (err && lov->lov_tgts[loi->loi_ost_idx]->ltd_active) {
+                        CERROR("error: cancel unused objid "LPX64" subobj "LPX64
+                               " on OST idx %d: rc = %d\n", lsm->lsm_object_id,
+                               loi->loi_id, loi->loi_ost_idx, err);
+                        if (!rc)
+                                rc = err;
                 }
-
-                if (!rc)
-                        rc = err;
         }
         RETURN(rc);
 }
 
-#define LOV_U64_MAX ((__u64)~0ULL)
-#define LOV_SUM_MAX(tot, add)                                           \
-        do {                                                            \
-                if ((tot) + (add) < (tot))                              \
-                        (tot) = LOV_U64_MAX;                            \
-                else                                                    \
-                        (tot) += (add);                                 \
-        } while(0)
-
-static int lov_statfs(struct obd_device *obd, struct obd_statfs *osfs,
-                      unsigned long max_age)
+int lov_statfs_interpret(struct ptlrpc_request_set *rqset, void *data, int rc)
 {
-        struct lov_obd *lov = &obd->u.lov;
-        struct lov_tgt_desc *tgt = lov->tgts;
-        struct obd_statfs lov_sfs;
-        int set = 0;
-        int rc = 0;
-        int i;
+        struct lov_request_set *lovset = (struct lov_request_set *)data;
+        int err;
         ENTRY;
 
+        if (rc)
+                lovset->set_completes = 0;
 
-        /* We only get block data from the OBD */
-        for (i = 0; i < lov->desc.ld_tgt_count; i++, tgt++) {
-                int err;
+        err = lov_fini_statfs_set(lovset);
+        RETURN(rc ? rc : err);
+}
 
-                if (!lov_tgt_active(lov, tgt, 0)) {
-                        CDEBUG(D_HA, "lov idx %d inactive\n", i);
-                        continue;
-                }
+static int lov_statfs_async(struct obd_device *obd, struct obd_info *oinfo,
+                            __u64 max_age, struct ptlrpc_request_set *rqset)
+{
+        struct lov_request_set *set;
+        struct lov_request *req;
+        cfs_list_t *pos;
+        struct lov_obd *lov;
+        int rc = 0;
+        ENTRY;
 
-                err = obd_statfs(class_exp2obd(tgt->ltd_exp), &lov_sfs,max_age);
-                lov_tgt_decref(lov, tgt);
-                if (err) {
-                        if (lov_tgt_active(lov, tgt, 0)) {
-                                lov_tgt_decref(lov, tgt);
-                                if (!rc)
-                                        rc = err;
-                        }
-                        continue;
-                }
+        LASSERT(oinfo != NULL);
+        LASSERT(oinfo->oi_osfs != NULL);
 
-                if (!set) {
-                        memcpy(osfs, &lov_sfs, sizeof(lov_sfs));
-                        set = 1;
-                } else {
-                        osfs->os_bfree += lov_sfs.os_bfree;
-                        osfs->os_bavail += lov_sfs.os_bavail;
-                        osfs->os_blocks += lov_sfs.os_blocks;
-                        /* XXX not sure about this one - depends on policy.
-                         *   - could be minimum if we always stripe on all OBDs
-                         *     (but that would be wrong for any other policy,
-                         *     if one of the OBDs has no more objects left)
-                         *   - could be sum if we stripe whole objects
-                         *   - could be average, just to give a nice number
-                         *
-                         * To give a "reasonable" (if not wholly accurate)
-                         * number, we divide the total number of free objects
-                         * by expected stripe count (watch out for overflow).
-                         */
-                        LOV_SUM_MAX(osfs->os_files, lov_sfs.os_files);
-                        LOV_SUM_MAX(osfs->os_ffree, lov_sfs.os_ffree);
-                }
+        lov = &obd->u.lov;
+        rc = lov_prep_statfs_set(obd, oinfo, &set);
+        if (rc)
+                RETURN(rc);
+
+        cfs_list_for_each (pos, &set->set_list) {
+                struct obd_device *osc_obd;
+
+                req = cfs_list_entry(pos, struct lov_request, rq_link);
+
+                osc_obd = class_exp2obd(lov->lov_tgts[req->rq_idx]->ltd_exp);
+                rc = obd_statfs_async(osc_obd, &req->rq_oi, max_age, rqset);
+                if (rc)
+                        break;
         }
 
-        if (set) {
-                __u32 expected_stripes = lov->desc.ld_default_stripe_count ?
-                                         lov->desc.ld_default_stripe_count :
-                                         lov->desc.ld_active_tgt_count;
+        if (rc || cfs_list_empty(&rqset->set_requests)) {
+                int err;
+                if (rc)
+                        set->set_completes = 0;
+                err = lov_fini_statfs_set(set);
+                RETURN(rc ? rc : err);
+        }
 
-                if ((lov->desc.ld_default_stripe_count == 0) ||
-                    (lov->desc.ld_default_stripe_count >
-                     lov->desc.ld_active_tgt_count)) {
-                        expected_stripes = lov->desc.ld_active_tgt_count;
-                } else {
-                        expected_stripes = lov->desc.ld_default_stripe_count;
-                }
+        LASSERT(rqset->set_interpret == NULL);
+        rqset->set_interpret = lov_statfs_interpret;
+        rqset->set_arg = (void *)set;
+        RETURN(0);
+}
+
+static int lov_statfs(struct obd_device *obd, struct obd_statfs *osfs,
+                      __u64 max_age, __u32 flags)
+{
+        struct ptlrpc_request_set *set = NULL;
+        struct obd_info oinfo = { { { 0 } } };
+        int rc = 0;
+        ENTRY;
 
-                if (osfs->os_files != LOV_U64_MAX)
-                        do_div(osfs->os_files, expected_stripes);
-                if (osfs->os_ffree != LOV_U64_MAX)
-                        do_div(osfs->os_ffree, expected_stripes);
-        } else if (!rc)
-                rc = -EIO;
+
+        /* for obdclass we forbid using obd_statfs_rqset, but prefer using async
+         * statfs requests */
+        set = ptlrpc_prep_set();
+        if (set == NULL)
+                RETURN(-ENOMEM);
+
+        oinfo.oi_osfs = osfs;
+        oinfo.oi_flags = flags;
+        rc = lov_statfs_async(obd, &oinfo, max_age, set);
+        if (rc == 0)
+                rc = ptlrpc_set_wait(set);
+        ptlrpc_set_destroy(set);
 
         RETURN(rc);
 }
@@ -1992,19 +1937,53 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
 {
         struct obd_device *obddev = class_exp2obd(exp);
         struct lov_obd *lov = &obddev->u.lov;
-        struct lov_tgt_desc *tgt;
-        int i, rc, count = lov->desc.ld_tgt_count;
+        int i = 0, rc = 0, count = lov->desc.ld_tgt_count;
         struct obd_uuid *uuidp;
         ENTRY;
 
         switch (cmd) {
-        case OBD_IOC_LOV_GET_CONFIG: {
+        case IOC_OBD_STATFS: {
                 struct obd_ioctl_data *data = karg;
+                struct obd_device *osc_obd;
+                struct obd_statfs stat_buf = {0};
+                __u32 index;
+
+                memcpy(&index, data->ioc_inlbuf2, sizeof(__u32));
+                LASSERT(data->ioc_plen1 == sizeof(struct obd_statfs));
+
+                if ((index >= count))
+                        RETURN(-ENODEV);
+
+                if (!lov->lov_tgts[index])
+                        /* Try again with the next index */
+                        RETURN(-EAGAIN);
+                if (!lov->lov_tgts[index]->ltd_active)
+                        RETURN(-ENODATA);
+
+                osc_obd = class_exp2obd(lov->lov_tgts[index]->ltd_exp);
+                if (!osc_obd)
+                        RETURN(-EINVAL);
+
+                /* got statfs data */
+                rc = obd_statfs(osc_obd, &stat_buf,
+                                cfs_time_current_64() - CFS_HZ, 0);
+                if (rc)
+                        RETURN(rc);
+                if (cfs_copy_to_user(data->ioc_pbuf1, &stat_buf,
+                                     data->ioc_plen1))
+                        RETURN(-EFAULT);
+                /* copy UUID */
+                if (cfs_copy_to_user(data->ioc_pbuf2, obd2cli_tgt(osc_obd),
+                                     data->ioc_plen2))
+                        RETURN(-EFAULT);
+                break;
+        }
+        case OBD_IOC_LOV_GET_CONFIG: {
+                struct obd_ioctl_data *data;
                 struct lov_desc *desc;
                 char *buf = NULL;
                 __u32 *genp;
 
-                buf = NULL;
                 len = 0;
                 if (obd_ioctl_getdata(&buf, &len, (void *)uarg))
                         RETURN(-EINVAL);
@@ -2032,22 +2011,20 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 uuidp = (struct obd_uuid *)data->ioc_inlbuf2;
                 genp = (__u32 *)data->ioc_inlbuf3;
                 /* the uuid will be empty for deleted OSTs */
-                lov_tgts_lock(lov);
-                tgt = lov->tgts;
-                for (i = 0; i < count; i++, uuidp++, genp++, tgt++) {
-                        obd_str2uuid(uuidp, (char *)tgt->uuid.uuid);
-                        *genp = tgt->ltd_gen;
+                for (i = 0; i < count; i++, uuidp++, genp++) {
+                        if (!lov->lov_tgts[i])
+                                continue;
+                        *uuidp = lov->lov_tgts[i]->ltd_uuid;
+                        *genp = lov->lov_tgts[i]->ltd_gen;
                 }
-                lov_tgts_unlock(lov);
 
-                rc = copy_to_user((void *)uarg, buf, len);
-                if (rc)
+                if (cfs_copy_to_user((void *)uarg, buf, len))
                         rc = -EFAULT;
                 obd_ioctl_freedata(buf, len);
                 break;
         }
         case LL_IOC_LOV_SETSTRIPE:
-                rc = lov_setstripe(exp, karg, uarg);
+                rc = lov_setstripe(exp, len, karg, uarg);
                 break;
         case LL_IOC_LOV_GETSTRIPE:
                 rc = lov_getstripe(exp, karg, uarg);
@@ -2055,37 +2032,84 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         case LL_IOC_LOV_SETEA:
                 rc = lov_setea(exp, karg, uarg);
                 break;
+        case OBD_IOC_QUOTACTL: {
+                struct if_quotactl *qctl = karg;
+                struct lov_tgt_desc *tgt = NULL;
+                struct obd_quotactl *oqctl;
+
+                if (qctl->qc_valid == QC_OSTIDX) {
+                        if (qctl->qc_idx < 0 || count <= qctl->qc_idx)
+                                RETURN(-EINVAL);
+
+                        tgt = lov->lov_tgts[qctl->qc_idx];
+                        if (!tgt || !tgt->ltd_exp)
+                                RETURN(-EINVAL);
+                } else if (qctl->qc_valid == QC_UUID) {
+                        for (i = 0; i < count; i++) {
+                                tgt = lov->lov_tgts[i];
+                                if (!tgt ||
+                                    !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_OSTIDX;
+                        qctl->obd_uuid = tgt->ltd_uuid;
+                }
+                OBD_FREE_PTR(oqctl);
+                break;
+        }
         default: {
                 int set = 0;
+
                 if (count == 0)
                         RETURN(-ENOTTY);
-                rc = 0;
-                for (i = 0, tgt = lov->tgts; i < count; i++, tgt++) {
+
+                for (i = 0; i < count; i++) {
                         int err;
 
-                        if (!lov_tgt_active(lov, tgt, 0)) {
-                                CERROR("error: iocontrol failed for OSC %s on "
-                                       "OST idx %d: OST inactive.\n",
-                                       tgt->uuid.uuid, i);
-                                if (!rc)
-                                        rc = -EIO;
+                        /* OST was disconnected */
+                        if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_exp)
                                 continue;
-                        }
 
-                        err = obd_iocontrol(cmd, tgt->ltd_exp, len, karg, uarg);
-                        lov_tgt_decref(lov, tgt);
-                        if (err) {
-                                if (lov_tgt_ready(lov, tgt, 0)) {
-                                        lov_tgt_decref(lov, tgt);
-                                        CERROR("error: iocontrol OSC %s on OST "
+                        err = obd_iocontrol(cmd, lov->lov_tgts[i]->ltd_exp,
+                                            len, karg, uarg);
+                        if (err == -ENODATA && cmd == OBD_IOC_POLL_QUOTACHECK) {
+                                RETURN(err);
+                        } else if (err) {
+                                if (lov->lov_tgts[i]->ltd_active) {
+                                        CDEBUG(err == -ENOTTY ?
+                                               D_IOCTL : D_WARNING,
+                                               "iocontrol OSC %s on OST "
                                                "idx %d cmd %x: err = %d\n",
-                                               lov->tgts[i].uuid.uuid, i,
-                                               cmd, err);
+                                               lov_uuid2str(lov, i),
+                                               i, cmd, err);
                                         if (!rc)
                                                 rc = err;
                                 }
-                        } else
+                        } else {
                                 set = 1;
+                        }
                 }
                 if (!set && !rc)
                         rc = -EIO;
@@ -2095,31 +2119,383 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         RETURN(rc);
 }
 
+#define FIEMAP_BUFFER_SIZE 4096
+
+/**
+ * Non-zero fe_logical indicates that this is a continuation FIEMAP
+ * call. The local end offset and the device are sent in the first
+ * fm_extent. This function calculates the stripe number from the index.
+ * This function returns a stripe_no on which mapping is to be restarted.
+ *
+ * This function returns fm_end_offset which is the in-OST offset at which
+ * mapping should be restarted. If fm_end_offset=0 is returned then caller
+ * will re-calculate proper offset in next stripe.
+ * Note that the first extent is passed to lov_get_info via the value field.
+ *
+ * \param fiemap fiemap request header
+ * \param lsm striping information for the file
+ * \param fm_start logical start of mapping
+ * \param fm_end logical end of mapping
+ * \param start_stripe starting stripe will be returned in this
+ */
+obd_size fiemap_calc_fm_end_offset(struct ll_user_fiemap *fiemap,
+                                   struct lov_stripe_md *lsm, obd_size fm_start,
+                                   obd_size fm_end, int *start_stripe)
+{
+        obd_size local_end = fiemap->fm_extents[0].fe_logical;
+        obd_off lun_start, lun_end;
+        obd_size fm_end_offset;
+        int stripe_no = -1, i;
+
+        if (fiemap->fm_extent_count == 0 ||
+            fiemap->fm_extents[0].fe_logical == 0)
+                return 0;
+
+        /* Find out stripe_no from ost_index saved in the fe_device */
+        for (i = 0; i < lsm->lsm_stripe_count; i++) {
+                if (lsm->lsm_oinfo[i]->loi_ost_idx ==
+                                        fiemap->fm_extents[0].fe_device) {
+                        stripe_no = i;
+                        break;
+                }
+        }
+
+        /* If we have finished mapping on previous device, shift logical
+         * offset to start of next device */
+        if ((lov_stripe_intersects(lsm, stripe_no, fm_start, fm_end,
+                                   &lun_start, &lun_end)) != 0 &&
+                                   local_end < lun_end) {
+                fm_end_offset = local_end;
+                *start_stripe = stripe_no;
+        } else {
+                /* This is a special value to indicate that caller should
+                 * calculate offset in next stripe. */
+                fm_end_offset = 0;
+                *start_stripe = (stripe_no + 1) % lsm->lsm_stripe_count;
+        }
+
+        return fm_end_offset;
+}
+
+/**
+ * We calculate on which OST the mapping will end. If the length of mapping
+ * is greater than (stripe_size * stripe_count) then the last_stripe will
+ * will be one just before start_stripe. Else we check if the mapping
+ * intersects each OST and find last_stripe.
+ * This function returns the last_stripe and also sets the stripe_count
+ * over which the mapping is spread
+ *
+ * \param lsm striping information for the file
+ * \param fm_start logical start of mapping
+ * \param fm_end logical end of mapping
+ * \param start_stripe starting stripe of the mapping
+ * \param stripe_count the number of stripes across which to map is returned
+ *
+ * \retval last_stripe return the last stripe of the mapping
+ */
+int fiemap_calc_last_stripe(struct lov_stripe_md *lsm, obd_size fm_start,
+                            obd_size fm_end, int start_stripe,
+                            int *stripe_count)
+{
+        int last_stripe;
+        obd_off obd_start, obd_end;
+        int i, j;
+
+        if (fm_end - fm_start > lsm->lsm_stripe_size * lsm->lsm_stripe_count) {
+                last_stripe = (start_stripe < 1 ? lsm->lsm_stripe_count - 1 :
+                                                              start_stripe - 1);
+                *stripe_count = lsm->lsm_stripe_count;
+        } else {
+                for (j = 0, i = start_stripe; j < lsm->lsm_stripe_count;
+                     i = (i + 1) % lsm->lsm_stripe_count, j++) {
+                        if ((lov_stripe_intersects(lsm, i, fm_start, fm_end,
+                                                   &obd_start, &obd_end)) == 0)
+                                break;
+                }
+                *stripe_count = j;
+                last_stripe = (start_stripe + j - 1) %lsm->lsm_stripe_count;
+        }
+
+        return last_stripe;
+}
+
+/**
+ * Set fe_device and copy extents from local buffer into main return buffer.
+ *
+ * \param fiemap fiemap request header
+ * \param lcl_fm_ext array of local fiemap extents to be copied
+ * \param ost_index OST index to be written into the fm_device field for each
+                    extent
+ * \param ext_count number of extents to be copied
+ * \param current_extent where to start copying in main extent array
+ */
+void fiemap_prepare_and_copy_exts(struct ll_user_fiemap *fiemap,
+                                  struct ll_fiemap_extent *lcl_fm_ext,
+                                  int ost_index, unsigned int ext_count,
+                                  int current_extent)
+{
+        char *to;
+        int ext;
+
+        for (ext = 0; ext < ext_count; ext++) {
+                lcl_fm_ext[ext].fe_device = ost_index;
+                lcl_fm_ext[ext].fe_flags |= FIEMAP_EXTENT_NET;
+        }
+
+        /* Copy fm_extent's from fm_local to return buffer */
+        to = (char *)fiemap + fiemap_count_to_size(current_extent);
+        memcpy(to, lcl_fm_ext, ext_count * sizeof(struct ll_fiemap_extent));
+}
+
+/**
+ * Break down the FIEMAP request and send appropriate calls to individual OSTs.
+ * This also handles the restarting of FIEMAP calls in case mapping overflows
+ * the available number of extents in single call.
+ */
+static int lov_fiemap(struct lov_obd *lov, __u32 keylen, void *key,
+                      __u32 *vallen, void *val, struct lov_stripe_md *lsm)
+{
+        struct ll_fiemap_info_key *fm_key = key;
+        struct ll_user_fiemap *fiemap = val;
+        struct ll_user_fiemap *fm_local = NULL;
+        struct ll_fiemap_extent *lcl_fm_ext;
+        int count_local;
+        unsigned int get_num_extents = 0;
+        int ost_index = 0, actual_start_stripe, start_stripe;
+        obd_size fm_start, fm_end, fm_length, fm_end_offset = 0;
+        obd_size curr_loc;
+        int current_extent = 0, rc = 0, i;
+        int ost_eof = 0; /* EOF for object */
+        int ost_done = 0; /* done with required mapping for this OST? */
+        int last_stripe;
+        int cur_stripe = 0, cur_stripe_wrap = 0, stripe_count;
+        unsigned int buffer_size = FIEMAP_BUFFER_SIZE;
+
+        if (lsm == NULL)
+                GOTO(out, rc = 0);
+
+        if (fiemap_count_to_size(fm_key->fiemap.fm_extent_count) < buffer_size)
+                buffer_size = fiemap_count_to_size(fm_key->fiemap.fm_extent_count);
+
+        OBD_ALLOC(fm_local, buffer_size);
+        if (fm_local == NULL)
+                GOTO(out, rc = -ENOMEM);
+        lcl_fm_ext = &fm_local->fm_extents[0];
+
+        count_local = fiemap_size_to_count(buffer_size);
+
+        memcpy(fiemap, &fm_key->fiemap, sizeof(*fiemap));
+        fm_start = fiemap->fm_start;
+        fm_length = fiemap->fm_length;
+        /* Calculate start stripe, last stripe and length of mapping */
+        actual_start_stripe = start_stripe = lov_stripe_number(lsm, fm_start);
+        fm_end = (fm_length == ~0ULL ? fm_key->oa.o_size :
+                                                fm_start + fm_length - 1);
+        /* If fm_length != ~0ULL but fm_start+fm_length-1 exceeds file size */
+        if (fm_end > fm_key->oa.o_size)
+                fm_end = fm_key->oa.o_size;
+
+        last_stripe = fiemap_calc_last_stripe(lsm, fm_start, fm_end,
+                                            actual_start_stripe, &stripe_count);
+
+        fm_end_offset = fiemap_calc_fm_end_offset(fiemap, lsm, fm_start, fm_end,
+                                                  &start_stripe);
+
+        if (fiemap->fm_extent_count == 0) {
+                get_num_extents = 1;
+                count_local = 0;
+        }
+
+        /* Check each stripe */
+        for (cur_stripe = start_stripe, i = 0; i < stripe_count;
+             i++, cur_stripe = (cur_stripe + 1) % lsm->lsm_stripe_count) {
+                obd_size req_fm_len; /* Stores length of required mapping */
+                obd_size len_mapped_single_call;
+                obd_off lun_start, lun_end, obd_object_end;
+                unsigned int ext_count;
+
+                cur_stripe_wrap = cur_stripe;
+
+                /* Find out range of mapping on this stripe */
+                if ((lov_stripe_intersects(lsm, cur_stripe, fm_start, fm_end,
+                                           &lun_start, &obd_object_end)) == 0)
+                        continue;
+
+                /* If this is a continuation FIEMAP call and we are on
+                 * starting stripe then lun_start needs to be set to
+                 * fm_end_offset */
+                if (fm_end_offset != 0 && cur_stripe == start_stripe)
+                        lun_start = fm_end_offset;
+
+                if (fm_length != ~0ULL) {
+                        /* Handle fm_start + fm_length overflow */
+                        if (fm_start + fm_length < fm_start)
+                                fm_length = ~0ULL - fm_start;
+                        lun_end = lov_size_to_stripe(lsm, fm_start + fm_length,
+                                                     cur_stripe);
+                } else {
+                        lun_end = ~0ULL;
+                }
+
+                if (lun_start == lun_end)
+                        continue;
+
+                req_fm_len = obd_object_end - lun_start;
+                fm_local->fm_length = 0;
+                len_mapped_single_call = 0;
+
+                /* If the output buffer is very large and the objects have many
+                 * extents we may need to loop on a single OST repeatedly */
+                ost_eof = 0;
+                ost_done = 0;
+                do {
+                        if (get_num_extents == 0) {
+                                /* Don't get too many extents. */
+                                if (current_extent + count_local >
+                                    fiemap->fm_extent_count)
+                                        count_local = fiemap->fm_extent_count -
+                                                                 current_extent;
+                        }
+
+                        lun_start += len_mapped_single_call;
+                        fm_local->fm_length = req_fm_len - len_mapped_single_call;
+                        req_fm_len = fm_local->fm_length;
+                        fm_local->fm_extent_count = count_local;
+                        fm_local->fm_mapped_extents = 0;
+                        fm_local->fm_flags = fiemap->fm_flags;
+
+                        fm_key->oa.o_id = lsm->lsm_oinfo[cur_stripe]->loi_id;
+                        ost_index = lsm->lsm_oinfo[cur_stripe]->loi_ost_idx;
+
+                        if (ost_index < 0 || ost_index >=lov->desc.ld_tgt_count)
+                                GOTO(out, rc = -EINVAL);
+
+                        /* If OST is inactive, return extent with UNKNOWN flag */
+                        if (!lov->lov_tgts[ost_index]->ltd_active) {
+                                fm_local->fm_flags |= FIEMAP_EXTENT_LAST;
+                                fm_local->fm_mapped_extents = 1;
+
+                                lcl_fm_ext[0].fe_logical = lun_start;
+                                lcl_fm_ext[0].fe_length = obd_object_end -
+                                                                      lun_start;
+                                lcl_fm_ext[0].fe_flags |= FIEMAP_EXTENT_UNKNOWN;
+
+                                goto inactive_tgt;
+                        }
+
+                        fm_local->fm_start = lun_start;
+                        fm_local->fm_flags &= ~FIEMAP_FLAG_DEVICE_ORDER;
+                        memcpy(&fm_key->fiemap, fm_local, sizeof(*fm_local));
+                        *vallen=fiemap_count_to_size(fm_local->fm_extent_count);
+                        rc = obd_get_info(lov->lov_tgts[ost_index]->ltd_exp,
+                                          keylen, key, vallen, fm_local, lsm);
+                        if (rc != 0)
+                                GOTO(out, rc);
+
+inactive_tgt:
+                        ext_count = fm_local->fm_mapped_extents;
+                        if (ext_count == 0) {
+                                ost_done = 1;
+                                /* If last stripe has hole at the end,
+                                 * then we need to return */
+                                if (cur_stripe_wrap == last_stripe) {
+                                        fiemap->fm_mapped_extents = 0;
+                                        goto finish;
+                                }
+                                break;
+                        }
+
+                        /* If we just need num of extents then go to next device */
+                        if (get_num_extents) {
+                                current_extent += ext_count;
+                                break;
+                        }
+
+                        len_mapped_single_call = lcl_fm_ext[ext_count-1].fe_logical -
+                                  lun_start + lcl_fm_ext[ext_count - 1].fe_length;
+
+                        /* Have we finished mapping on this device? */
+                        if (req_fm_len <= len_mapped_single_call)
+                                ost_done = 1;
+
+                        /* Clear the EXTENT_LAST flag which can be present on
+                         * last extent */
+                        if (lcl_fm_ext[ext_count-1].fe_flags & FIEMAP_EXTENT_LAST)
+                                lcl_fm_ext[ext_count - 1].fe_flags &=
+                                                            ~FIEMAP_EXTENT_LAST;
+
+                        curr_loc = lov_stripe_size(lsm,
+                                           lcl_fm_ext[ext_count - 1].fe_logical+
+                                           lcl_fm_ext[ext_count - 1].fe_length,
+                                           cur_stripe);
+                        if (curr_loc >= fm_key->oa.o_size)
+                                ost_eof = 1;
+
+                        fiemap_prepare_and_copy_exts(fiemap, lcl_fm_ext,
+                                                     ost_index, ext_count,
+                                                     current_extent);
+
+                        current_extent += ext_count;
+
+                        /* Ran out of available extents? */
+                        if (current_extent >= fiemap->fm_extent_count)
+                                goto finish;
+                } while (ost_done == 0 && ost_eof == 0);
+
+                if (cur_stripe_wrap == last_stripe)
+                        goto finish;
+        }
+
+finish:
+        /* Indicate that we are returning device offsets unless file just has
+         * single stripe */
+        if (lsm->lsm_stripe_count > 1)
+                fiemap->fm_flags |= FIEMAP_FLAG_DEVICE_ORDER;
+
+        if (get_num_extents)
+                goto skip_last_device_calc;
+
+        /* Check if we have reached the last stripe and whether mapping for that
+         * stripe is done. */
+        if (cur_stripe_wrap == last_stripe) {
+                if (ost_done || ost_eof)
+                        fiemap->fm_extents[current_extent - 1].fe_flags |=
+                                                             FIEMAP_EXTENT_LAST;
+        }
+
+skip_last_device_calc:
+        fiemap->fm_mapped_extents = current_extent;
+
+out:
+        OBD_FREE(fm_local, buffer_size);
+        return rc;
+}
+
 static int lov_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 *obddev = class_exp2obd(exp);
         struct lov_obd *lov = &obddev->u.lov;
-        struct lov_tgt_desc *tgt;
-        int i;
+        int i, rc;
         ENTRY;
 
         if (!vallen || !val)
                 RETURN(-EFAULT);
 
-        if (keylen > strlen("lock_to_stripe") &&
-            strcmp(key, "lock_to_stripe") == 0) {
+        obd_getref(obddev);
+
+        if (KEY_IS(KEY_LOCK_TO_STRIPE)) {
                 struct {
                         char name[16];
                         struct ldlm_lock *lock;
-                        struct lov_stripe_md *lsm;
                 } *data = key;
-                struct lov_oinfo *loi;
                 struct ldlm_res_id *res_id = &data->lock->l_resource->lr_name;
+                struct lov_oinfo *loi;
                 __u32 *stripe = val;
 
                 if (*vallen < sizeof(*stripe))
-                        RETURN(-EFAULT);
+                        GOTO(out, rc = -EFAULT);
                 *vallen = sizeof(*stripe);
 
                 /* XXX This is another one of those bits that will need to
@@ -2128,454 +2504,329 @@ static int lov_get_info(struct obd_export *exp, __u32 keylen,
                 /* XXX - it's assumed all the locks for deleted OSTs have
                  * been cancelled. Also, the export for deleted OSTs will
                  * be NULL and won't match the lock's export. */
-                lov_tgts_lock(lov);
-                for (i = 0, loi = data->lsm->lsm_oinfo;
-                     i < data->lsm->lsm_stripe_count;
-                     i++, loi++) {
-                        if (lov->tgts[loi->loi_ost_idx].ltd_exp ==
-                                        data->lock->l_conn_export &&
-                            loi->loi_id == res_id->name[0] &&
-                            loi->loi_gr == res_id->name[2]) {
-                                lov_tgts_unlock(lov);
+                for (i = 0; i < lsm->lsm_stripe_count; i++) {
+                        loi = lsm->lsm_oinfo[i];
+                        if (!lov->lov_tgts[loi->loi_ost_idx])
+                                continue;
+                        if (lov->lov_tgts[loi->loi_ost_idx]->ltd_exp ==
+                            data->lock->l_conn_export &&
+                            osc_res_name_eq(loi->loi_id, loi->loi_gr, res_id)) {
                                 *stripe = i;
-                                RETURN(0);
+                                GOTO(out, rc = 0);
                         }
                 }
-                lov_tgts_unlock(lov);
-                
-                /* This can happen if a deleted OST has been replaced
-                 * in the lsm by the MDS.  */
                 LDLM_ERROR(data->lock, "lock on inode without such object");
-                dump_lsm(D_ERROR, data->lsm);
-                portals_debug_dumpstack(NULL);
-
-                RETURN(-ENXIO);
-        } else if (keylen >= strlen("size_to_stripe") &&
-                   strcmp(key, "size_to_stripe") == 0) {
-                struct {
-                        int stripe_number;
-                        __u64 size;
-                        struct lov_stripe_md *lsm;
-                } *data = val;
+                dump_lsm(D_ERROR, lsm);
+                GOTO(out, rc = -ENXIO);
+        } else if (KEY_IS(KEY_LAST_ID)) {
+                struct obd_id_info *info = val;
+                __u32 size = sizeof(obd_id);
+                struct lov_tgt_desc *tgt;
 
-                if (*vallen < sizeof(*data))
-                        RETURN(-EFAULT);
+                LASSERT(*vallen == sizeof(struct obd_id_info));
+                tgt = lov->lov_tgts[info->idx];
 
-                data->size = lov_size_to_stripe(data->lsm, data->size,
-                                                data->stripe_number);
-                RETURN(0);
-        } else if (keylen >= strlen("last_id") && strcmp(key, "last_id") == 0) {
-                __u32 size = sizeof(obd_id);
-                obd_id *ids = val;
-                int rc = 0;
+                if (!tgt || !tgt->ltd_active)
+                        GOTO(out, rc = -ESRCH);
 
-                tgt = lov->tgts;
-                for (i = 0; i < lov->desc.ld_tgt_count; i++, tgt++) {
-                        if (!lov_tgt_active(lov, tgt, 0))
-                                continue;
-                        rc = obd_get_info(tgt->ltd_exp, keylen, key, &size,
-                                          ids + i);
-                        lov_tgt_decref(lov, tgt);
-                        if (rc != 0)
-                                RETURN(rc);
-                }
-                RETURN(0);
-        } else if (keylen >= strlen("lovdesc") && strcmp(key, "lovdesc") == 0) {
+                rc = obd_get_info(tgt->ltd_exp, keylen, key, &size, info->data, NULL);
+                GOTO(out, rc = 0);
+        } else if (KEY_IS(KEY_LOVDESC)) {
                 struct lov_desc *desc_ret = val;
                 *desc_ret = lov->desc;
 
-                RETURN(0);
+                GOTO(out, rc = 0);
+        } else if (KEY_IS(KEY_FIEMAP)) {
+                rc = lov_fiemap(lov, keylen, key, vallen, val, lsm);
+                GOTO(out, rc);
         }
 
-        RETURN(-EINVAL);
+        rc = -EINVAL;
+
+out:
+        obd_putref(obddev);
+        RETURN(rc);
 }
 
-static int lov_set_info(struct obd_export *exp, obd_count keylen,
-                        void *key, obd_count vallen, void *val)
+static int lov_set_info_async(struct obd_export *exp, obd_count keylen,
+                              void *key, obd_count vallen, void *val,
+                              struct ptlrpc_request_set *set)
 {
         struct obd_device *obddev = class_exp2obd(exp);
         struct lov_obd *lov = &obddev->u.lov;
-        struct lov_tgt_desc *tgt;
+        obd_count count;
         int i, rc = 0, err;
+        struct lov_tgt_desc *tgt;
+        unsigned incr, check_uuid,
+                 do_inactive, no_set;
+        unsigned next_id = 0,  mds_con = 0, capa = 0;
         ENTRY;
 
-#define KEY_IS(str) \
-        (keylen == strlen(str) && memcmp(key, str, keylen) == 0)
-
-        if (KEY_IS("async")) {
-                struct lov_desc *desc = &lov->desc;
-
-                if (vallen != sizeof(int))
-                        RETURN(-EINVAL);
-                lov->async = *((int*) val);
-
-                lov_tgts_lock(lov);
-                tgt = lov->tgts;
-                for (i = 0; i < desc->ld_tgt_count; i++, tgt++) {
-                        struct obd_uuid *tgt_uuid = &tgt->uuid;
-                        struct obd_device *tgt_obd;
-
-                        tgt_obd = class_find_client_obd(tgt_uuid,
-                                                        OBD_OSC_DEVICENAME,
-                                                        &obddev->obd_uuid);
-                        if (!tgt_obd) {
-                                CERROR("Target %s not attached\n",
-                                        tgt_uuid->uuid);
-                                if (!rc)
-                                        rc = -EINVAL;
-                                continue;
-                        }
-
-                        err = obd_set_info(tgt_obd->obd_self_export,
-                                           keylen, key, vallen, val);
-                        if (err) {
-                                CERROR("Failed to set async on target %s\n",
-                                        tgt_obd->obd_name);
-                                if (!rc)
-                                        rc = err;
-                        }
-                }
-                lov_tgts_unlock(lov);
-                RETURN(rc);
+        incr = check_uuid = do_inactive = no_set = 0;
+        if (set == NULL) {
+                no_set = 1;
+                set = ptlrpc_prep_set();
+                if (!set)
+                        RETURN(-ENOMEM);
         }
 
-        if (KEY_IS("mds_conn")) {
-                if (vallen != sizeof(__u32))
-                        RETURN(-EINVAL);
-        } else if (KEY_IS("unlinked") || KEY_IS("unrecovery")) {
-                if (vallen != 0)
-                        RETURN(-EINVAL);
-        } else if (KEY_IS("sec") || KEY_IS("sec_flags")) {
-                struct lov_tgt_desc *tgt;
-                struct obd_export *exp;
-                int rc = 0, err, i;
-
-                lov_tgts_lock(lov);
-                tgt = lov->tgts;
-                for (i = 0; i < lov->desc.ld_tgt_count; i++, tgt++) {
-                        exp = tgt->ltd_exp;
-                        /* during setup time the connections to osc might
-                         * haven't been established.
-                         */
-                        if (exp == NULL) {
-                                struct obd_device *tgt_obd;
-
-                                tgt_obd = class_find_client_obd(&tgt->uuid,
-                                                                OBD_OSC_DEVICENAME,
-                                                                &obddev->obd_uuid);
-                                if (!tgt_obd) {
-                                        CERROR("can't set security flavor, "
-                                               "device %s not attached?\n",
-                                                tgt->uuid.uuid);
-                                        rc = -EINVAL;
-                                        continue;
-                                }
-                                exp = tgt_obd->obd_self_export;
-                        }
+        obd_getref(obddev);
+        count = lov->desc.ld_tgt_count;
 
-                        err = obd_set_info(exp, keylen, key, vallen, val);
-                        if (!rc)
-                                rc = err;
+        if (KEY_IS(KEY_NEXT_ID)) {
+                count = vallen / sizeof(struct obd_id_info);
+                vallen = sizeof(obd_id);
+                incr = sizeof(struct obd_id_info);
+                do_inactive = 1;
+                next_id = 1;
+        } else if (KEY_IS(KEY_CHECKSUM)) {
+                do_inactive = 1;
+        } else if (KEY_IS(KEY_EVICT_BY_NID)) {
+                /* use defaults:  do_inactive = incr = 0; */
+        } else if (KEY_IS(KEY_MDS_CONN)) {
+                mds_con = 1;
+        } else if (KEY_IS(KEY_CAPA_KEY)) {
+                capa = 1;
+        }
+
+        for (i = 0; i < count; i++, val = (char *)val + incr) {
+                if (next_id) {
+                        tgt = lov->lov_tgts[((struct obd_id_info*)val)->idx];
+                } else {
+                        tgt = lov->lov_tgts[i];
                 }
-                lov_tgts_unlock(lov);
+                /* OST was disconnected */
+                if (!tgt || !tgt->ltd_exp)
+                        continue;
 
-                RETURN(rc);
-        } else if (KEY_IS("auditlog")) {
-                ptl_nid_t nid = 0;
-                struct audit_msg * msg = val;
-                int i = 0, len = sizeof(nid);
-                struct obd_export * ost_exp;
-                //try to find client nid
-                for (i = 0; i < lov->desc.ld_tgt_count; i++) {
-                        if (!lov->tgts[i].ltd_exp)
-                                continue;
-                        rc = obd_get_info(lov->tgts[i].ltd_exp, 10,
-                                          "client_nid", &len, &nid);
-                        if (!rc)
-                                break;
-                }
-                
-                i = (__u32)nid % lov->desc.ld_tgt_count;
-                
-                CDEBUG(D_INFO, "Select OST %i for nid %.8x\n",i, (__u32)nid);
-                
-                ost_exp = lov->tgts[i].ltd_exp;
-                if (!ost_exp) {
-                        CERROR("can't send auditlog data,"
-                               "device %s is not attached?\n",
-                               lov->tgts[i].uuid.uuid);
-                        RETURN(-EFAULT);
-                }
-                msg->nid = nid;   
-                rc = obd_set_info(ost_exp, keylen, key, vallen, val);
-                
-                RETURN(rc);               
-        } else if (KEY_IS("audit_obj")) {
-                struct audit_lov_msg * msg = val;
-                int i = 0, index;
-                struct obd_export * ost_exp;
-                struct lov_oinfo *loi;
-                struct obdo *oa = NULL;
-                
-                oa = obdo_alloc();
-                if (oa == NULL)
-                        RETURN(-ENOMEM);
+                /* OST is inactive and we don't want inactive OSCs */
+                if (!tgt->ltd_active && !do_inactive)
+                        continue;
 
-                //set audit for all objects of file
-                CDEBUG(D_INFO, "Set audit 0x%x for objects\n", (__u32)msg->mask);
-                //use o_fid to store audit mask
-                oa->o_fid = msg->mask;
-                oa->o_uid = msg->uid;
-                oa->o_gid = msg->gid;
-                //iterate over all objects and set audit for each
-                for (i = 0, loi = msg->lsm->lsm_oinfo;
-                     i < msg->lsm->lsm_stripe_count; i++, loi++) {
-                        index = loi->loi_ost_idx;
-                        ost_exp = lov->tgts[index].ltd_exp;
-                        if (!ost_exp) {
-                                CERROR("can't send audit_obj data,"
-                                       "device %s is not attached?\n",
-                                       lov->tgts[i].uuid.uuid);
-                                continue;
-                        }
-                        oa->o_id = loi->loi_id;
-                        oa->o_gr = loi->loi_gr;
-                        
-                        obd_set_info(ost_exp, keylen, key, sizeof(*oa), oa);
-                }
+                if (mds_con) {
+                        struct mds_group_info *mgi;
 
-                obdo_free(oa);
-                RETURN(0);
-        } else if (KEY_IS("audit")) {
-                int i = 0;
-                struct obd_export * ost_exp;
+                        LASSERT(vallen == sizeof(*mgi));
+                        mgi = (struct mds_group_info *)val;
 
-                //set audit for whole fs on OSS
-                for (i = 0; i < lov->desc.ld_tgt_count; i++) {
-                        ost_exp = lov->tgts[i].ltd_exp;
-                        if (!ost_exp) {
-                                CERROR("can't send audit_fs data,"
-                                       "device %s is not attached?\n",
-                                       lov->tgts[i].uuid.uuid);
+                        /* Only want a specific OSC */
+                        if (mgi->uuid && !obd_uuid_equals(mgi->uuid,
+                                                &tgt->ltd_uuid))
                                 continue;
-                        }
-                        obd_set_info(ost_exp, keylen, key, vallen, val);
-                }
-                
-                RETURN(rc);           
-        } else if (KEY_IS("flush_cred") || KEY_IS("crypto_cb") ||
-                   KEY_IS("capa_key")) {
-                struct lov_tgt_desc *tgt;
-                int rc = 0, i;
 
-                tgt = lov->tgts;
-                for (i = 0; i < lov->desc.ld_tgt_count; i++, tgt++) {
-                        if (!lov_tgt_active(lov, tgt, 0))
+                        err = obd_set_info_async(tgt->ltd_exp,
+                                         keylen, key, sizeof(int),
+                                         &mgi->group, set);
+                } else if (next_id) {
+                        err = obd_set_info_async(tgt->ltd_exp,
+                                         keylen, key, vallen,
+                                         ((struct obd_id_info*)val)->data, set);
+                } else if (capa) {
+                        struct mds_capa_info *info = (struct mds_capa_info*)val;
+
+                        LASSERT(vallen == sizeof(*info));
+
+                         /* Only want a specific OSC */
+                        if (info->uuid &&
+                            !obd_uuid_equals(info->uuid, &tgt->ltd_uuid))
                                 continue;
-                        rc = obd_set_info(tgt->ltd_exp,
-                                          keylen, key, vallen, val);
-                        lov_tgt_decref(lov, tgt);
-                        if (rc)
-                                RETURN(rc);
-                }
-
-                RETURN(0);
-        } else if (KEY_IS("setext")) {
-                struct lov_tgt_desc *tgt;
-                int rc = 0, i;
 
-                for (i = 0, tgt = lov->tgts; i < lov->desc.ld_tgt_count;
-                     i++, tgt++) {
-                        if (!tgt->ltd_exp)
+                        err = obd_set_info_async(tgt->ltd_exp, keylen, key,
+                                                 sizeof(*info->capa),
+                                                 info->capa, set);
+                       
+                } else {
+                        /* Only want a specific OSC */
+                        if (check_uuid &&
+                            !obd_uuid_equals(val, &tgt->ltd_uuid))
                                 continue;
-                        rc = obd_set_info(tgt->ltd_exp,
-                                          keylen, key, vallen, val);
-                        if (rc)
-                                RETURN(rc);
+
+                        err = obd_set_info_async(tgt->ltd_exp,
+                                         keylen, key, vallen, val, set);
                 }
 
-                RETURN(0);
-        } else {
-                RETURN(-EINVAL);
+                if (!rc)
+                        rc = err;
         }
 
-        tgt = lov->tgts;
-        for (i = 0; i < lov->desc.ld_tgt_count; i++, tgt++) {
-                int active = 0;
-
-                if (val) {
-                        if (!obd_uuid_equals(val, &tgt->uuid))
-                                continue;
-                } else if (!lov_tgt_active(lov, tgt, 0)) {
-                        continue;
-                } else {
-                        active = 1;
-                }
-
-                err = obd_set_info(tgt->ltd_exp, keylen, key, vallen, val);
+        obd_putref(obddev);
+        if (no_set) {
+                err = ptlrpc_set_wait(set);
                 if (!rc)
                         rc = err;
-                if (active)
-                        lov_tgt_decref(lov, tgt);
+                ptlrpc_set_destroy(set);
         }
         RETURN(rc);
-#undef KEY_IS
 }
 
-#if 0
-struct lov_multi_wait {
-        struct ldlm_lock *lock;
-        wait_queue_t      wait;
-        int               completed;
-        int               generation;
-};
-
-int lov_complete_many(struct obd_export *exp, struct lov_stripe_md *lsm,
-                      struct lustre_handle *lockh)
+int lov_test_and_clear_async_rc(struct lov_stripe_md *lsm)
 {
-        struct lov_lock_handles *lov_lockh = NULL;
-        struct lustre_handle *lov_lockhp;
-        struct lov_obd *lov;
-        struct lov_oinfo *loi;
-        struct lov_multi_wait *queues;
-        int rc = 0, i;
+        int i, rc = 0;
         ENTRY;
 
-        if (lsm_bad_magic(lsm))
-                RETURN(-EINVAL);
-
-        if (!exp || !exp->exp_obd)
-                RETURN(-ENODEV);
-
-        LASSERT(lockh != NULL);
-        if (lsm->lsm_stripe_count > 1) {
-                lov_lockh = lov_handle2llh(lockh);
-                if (lov_lockh == NULL) {
-                        CERROR("LOV: invalid lov lock handle %p\n", lockh);
-                        RETURN(-EINVAL);
-                }
-
-                lov_lockhp = lov_lockh->llh_handles;
-        } else {
-                lov_lockhp = lockh;
+        for (i = 0; i < lsm->lsm_stripe_count; i++) {
+                struct lov_oinfo *loi = lsm->lsm_oinfo[i];
+                if (loi->loi_ar.ar_rc && !rc)
+                        rc = loi->loi_ar.ar_rc;
+                loi->loi_ar.ar_rc = 0;
         }
+        RETURN(rc);
+}
+EXPORT_SYMBOL(lov_test_and_clear_async_rc);
 
-        OBD_ALLOC(queues, lsm->lsm_stripe_count * sizeof(*queues));
-        if (queues == NULL)
-                GOTO(out, rc = -ENOMEM);
 
-        lov = &exp->exp_obd->u.lov;
-        for (i = 0, loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count;
-             i++, loi++, lov_lockhp++) {
-                struct ldlm_lock *lock;
-                struct obd_device *obd;
-                unsigned long irqflags;
-
-                lock = ldlm_handle2lock(lov_lockhp);
-                if (lock == NULL) {
-                        CDEBUG(D_HA, "lov idx %d subobj "LPX64" no lock?\n",
-                               loi->loi_ost_idx, loi->loi_id);
-                        queues[i].completed = 1;
-                        continue;
-                }
-
-                queues[i].lock = lock;
-                init_waitqueue_entry(&(queues[i].wait), current);
-                add_wait_queue(lock->l_waitq, &(queues[i].wait));
-
-                obd = class_exp2obd(lock->l_conn_export);
-                if (obd != NULL)
-                        imp = obd->u.cli.cl_import;
-                if (imp != NULL) {
-                        spin_lock_irqsave(&imp->imp_lock, irqflags);
-                        queues[i].generation = imp->imp_generation;
-                        spin_unlock_irqrestore(&imp->imp_lock, irqflags);
-                }
+static int lov_extent_calc(struct obd_export *exp, struct lov_stripe_md *lsm,
+                           int cmd, __u64 *offset)
+{
+        __u32 ssize = lsm->lsm_stripe_size;
+        __u64 start;
+
+        start = *offset;
+        do_div(start, ssize);
+        start = start * ssize;
+
+        CDEBUG(D_DLMTRACE, "offset "LPU64", stripe %u, start "LPU64
+                           ", end "LPU64"\n", *offset, ssize, start,
+                           start + ssize - 1);
+        if (cmd == OBD_CALC_STRIPE_END) {
+                *offset = start + ssize - 1;
+        } else if (cmd == OBD_CALC_STRIPE_START) {
+                *offset = start;
+        } else {
+                LBUG();
         }
 
-        lwi = LWI_TIMEOUT_INTR(obd_timeout * HZ, ldlm_expired_completion_wait,
-                               interrupted_completion_wait, &lwd);
-        rc = l_wait_event_added(check_multi_complete(queues, lsm), &lwi);
-
-        for (i = 0; i < lsm->lsm_stripe_count; i++)
-                remove_wait_queue(lock->l_waitq, &(queues[i].wait));
-
-        if (rc == -EINTR || rc == -ETIMEDOUT) {
-
+        RETURN(0);
+}
 
-        }
+void lov_stripe_lock(struct lov_stripe_md *md)
+{
+        LASSERT(md->lsm_lock_owner != cfs_curproc_pid());
+        cfs_spin_lock(&md->lsm_lock);
+        LASSERT(md->lsm_lock_owner == 0);
+        md->lsm_lock_owner = cfs_curproc_pid();
+}
+EXPORT_SYMBOL(lov_stripe_lock);
 
- out:
-        if (lov_lockh != NULL)
-                lov_llh_put(lov_lockh);
-        RETURN(rc);
+void lov_stripe_unlock(struct lov_stripe_md *md)
+{
+        LASSERT(md->lsm_lock_owner == cfs_curproc_pid());
+        md->lsm_lock_owner = 0;
+        cfs_spin_unlock(&md->lsm_lock);
 }
-#endif
+EXPORT_SYMBOL(lov_stripe_unlock);
+
 
 struct obd_ops lov_obd_ops = {
         .o_owner               = THIS_MODULE,
-        .o_attach              = lov_attach,
-        .o_detach              = lov_detach,
         .o_setup               = lov_setup,
+        .o_precleanup          = lov_precleanup,
         .o_cleanup             = lov_cleanup,
-        .o_process_config      = lov_process_config,
+        //.o_process_config      = lov_process_config,
         .o_connect             = lov_connect,
         .o_disconnect          = lov_disconnect,
         .o_statfs              = lov_statfs,
+        .o_statfs_async        = lov_statfs_async,
         .o_packmd              = lov_packmd,
         .o_unpackmd            = lov_unpackmd,
-        .o_revalidate_md       = lov_revalidate_md,
         .o_create              = lov_create,
         .o_destroy             = lov_destroy,
         .o_getattr             = lov_getattr,
         .o_getattr_async       = lov_getattr_async,
         .o_setattr             = lov_setattr,
+        .o_setattr_async       = lov_setattr_async,
         .o_brw                 = lov_brw,
-        .o_brw_async           = lov_brw_async,
-        .o_prep_async_page     = lov_prep_async_page,
-        .o_queue_async_io      = lov_queue_async_io,
-        .o_set_async_flags     = lov_set_async_flags,
-        .o_queue_group_io      = lov_queue_group_io,
-        .o_trigger_group_io    = lov_trigger_group_io,
-        .o_teardown_async_page = lov_teardown_async_page,
+        .o_merge_lvb           = lov_merge_lvb,
         .o_adjust_kms          = lov_adjust_kms,
         .o_punch               = lov_punch,
         .o_sync                = lov_sync,
         .o_enqueue             = lov_enqueue,
-        .o_match               = lov_match,
         .o_change_cbdata       = lov_change_cbdata,
         .o_cancel              = lov_cancel,
         .o_cancel_unused       = lov_cancel_unused,
         .o_iocontrol           = lov_iocontrol,
         .o_get_info            = lov_get_info,
-        .o_set_info            = lov_set_info,
+        .o_set_info_async      = lov_set_info_async,
+        .o_extent_calc         = lov_extent_calc,
         .o_llog_init           = lov_llog_init,
         .o_llog_finish         = lov_llog_finish,
         .o_notify              = lov_notify,
+        .o_pool_new            = lov_pool_new,
+        .o_pool_rem            = lov_pool_remove,
+        .o_pool_add            = lov_pool_add,
+        .o_pool_del            = lov_pool_del,
+        .o_getref              = lov_getref,
+        .o_putref              = lov_putref,
 };
 
+static quota_interface_t *quota_interface;
+extern quota_interface_t lov_quota_interface;
+
+cfs_mem_cache_t *lov_oinfo_slab;
+
+extern struct lu_kmem_descr lov_caches[];
+
 int __init lov_init(void)
 {
-        struct lprocfs_static_vars lvars;
-        int rc;
+        struct lprocfs_static_vars lvars = { 0 };
+        int rc, rc2;
         ENTRY;
 
-        lprocfs_init_vars(lov, &lvars);
+        /* print an address of _any_ initialized kernel symbol from this
+         * module, to allow debugging with gdb that doesn't support data
+         * symbols from modules.*/
+        CDEBUG(D_CONSOLE, "Lustre LOV module (%p).\n", &lov_caches);
+
+        rc = lu_kmem_init(lov_caches);
+        if (rc)
+                return rc;
+
+        lov_oinfo_slab = cfs_mem_cache_create("lov_oinfo",
+                                              sizeof(struct lov_oinfo),
+                                              0, CFS_SLAB_HWCACHE_ALIGN);
+        if (lov_oinfo_slab == NULL) {
+                lu_kmem_fini(lov_caches);
+                return -ENOMEM;
+        }
+        lprocfs_lov_init_vars(&lvars);
+
+        cfs_request_module("lquota");
+        quota_interface = PORTAL_SYMBOL_GET(lov_quota_interface);
+        init_obd_quota_ops(quota_interface, &lov_obd_ops);
+
         rc = class_register_type(&lov_obd_ops, NULL, lvars.module_vars,
-                                 OBD_LOV_DEVICENAME);
+                                 LUSTRE_LOV_NAME, &lov_device_type);
+
+        if (rc) {
+                if (quota_interface)
+                        PORTAL_SYMBOL_PUT(lov_quota_interface);
+                rc2 = cfs_mem_cache_destroy(lov_oinfo_slab);
+                LASSERT(rc2 == 0);
+                lu_kmem_fini(lov_caches);
+        }
+
         RETURN(rc);
 }
 
 #ifdef __KERNEL__
 static void /*__exit*/ lov_exit(void)
 {
-        class_unregister_type(OBD_LOV_DEVICENAME);
+        int rc;
+
+        lu_device_type_fini(&lov_device_type);
+        lu_kmem_fini(lov_caches);
+
+        if (quota_interface)
+                PORTAL_SYMBOL_PUT(lov_quota_interface);
+
+        class_unregister_type(LUSTRE_LOV_NAME);
+        rc = cfs_mem_cache_destroy(lov_oinfo_slab);
+        LASSERT(rc == 0);
 }
 
-MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
+MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
 MODULE_DESCRIPTION("Lustre Logical Object Volume OBD driver");
 MODULE_LICENSE("GPL");
 
-module_init(lov_init);
-module_exit(lov_exit);
+cfs_module(lov, LUSTRE_VERSION_STRING, lov_init, lov_exit);
 #endif