Whamcloud - gitweb
LU-7623 lov: Get rid of an ugly statfs hack in lov_iocontrol
[fs/lustre-release.git] / lustre / lov / lov_obd.c
index fa0b70b..7c00acf 100644 (file)
@@ -27,7 +27,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 #define DEBUG_SUBSYSTEM S_LOV
 #include <libcfs/libcfs.h>
 
-#include <obd_support.h>
-#include <lustre_ioctl.h>
-#include <lustre_lib.h>
-#include <lustre_net.h>
 #include <lustre/lustre_idl.h>
+
+#include <cl_object.h>
 #include <lustre_dlm.h>
+#include <lustre_fid.h>
+#include <lustre_ioctl.h>
+#include <lustre_lib.h>
 #include <lustre_mds.h>
-#include <obd_class.h>
-#include <lprocfs_status.h>
+#include <lustre_net.h>
 #include <lustre_param.h>
-#include <cl_object.h>
-#include <lclient.h>
-#include <lustre/ll_fiemap.h>
-#include <lustre_fid.h>
+#include <lustre_swab.h>
+#include <lprocfs_status.h>
+#include <obd_class.h>
+#include <obd_support.h>
 
 #include "lov_internal.h"
 
@@ -238,9 +238,9 @@ static int lov_connect(const struct lu_env *env,
         if (data)
                 lov->lov_ocd = *data;
 
-       lov->targets_proc_entry = lprocfs_seq_register("target_obds",
-                                                      obd->obd_proc_entry,
-                                                      NULL, NULL);
+       lov->targets_proc_entry = lprocfs_register("target_obds",
+                                                  obd->obd_proc_entry,
+                                                  NULL, NULL);
        if (IS_ERR(lov->targets_proc_entry)) {
                CERROR("%s: cannot register "
                       "/proc/fs/lustre/%s/%s/target_obds\n",
@@ -345,7 +345,7 @@ static int lov_disconnect(struct obd_export *exp)
         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);
+                       lov_del_target(obd, i, NULL, lov->lov_tgts[i]->ltd_gen);
                 }
         }
         obd_putref(obd);
@@ -657,7 +657,7 @@ out:
         if (rc) {
                 CERROR("add failed (%d), deleting %s\n", rc,
                        obd_uuid2str(&tgt->ltd_uuid));
-                lov_del_target(obd, index, 0, 0);
+               lov_del_target(obd, index, NULL, 0);
         }
         obd_putref(obd);
         RETURN(rc);
@@ -783,7 +783,7 @@ int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
        struct lov_desc *desc;
        struct lov_obd *lov = &obd->u.lov;
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
        struct obd_type *type;
 #endif
        int rc;
@@ -839,7 +839,7 @@ int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
         if (rc)
                GOTO(out, rc);
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
        obd->obd_vars = lprocfs_lov_obd_vars;
        /* If this is true then both client (lov) and server
         * (lod) are on the same node. The lod layer if loaded
@@ -848,9 +848,9 @@ int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
         * Instead we use type->typ_procsym as the parent. */
        type = class_search_type(LUSTRE_LOD_NAME);
        if (type != NULL && type->typ_procsym != NULL) {
-               obd->obd_proc_entry = lprocfs_seq_register(obd->obd_name,
-                                                          type->typ_procsym,
-                                                          obd->obd_vars, obd);
+               obd->obd_proc_entry = lprocfs_register(obd->obd_name,
+                                                      type->typ_procsym,
+                                                      obd->obd_vars, obd);
                if (IS_ERR(obd->obd_proc_entry)) {
                        rc = PTR_ERR(obd->obd_proc_entry);
                        CERROR("error %d setting up lprocfs for %s\n", rc,
@@ -867,9 +867,9 @@ int lov_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
                if (rc)
                        CWARN("Error adding the target_obd file\n");
 
-               lov->lov_pool_proc_entry = lprocfs_seq_register("pools",
-                                                       obd->obd_proc_entry,
-                                                       NULL, NULL);
+               lov->lov_pool_proc_entry = lprocfs_register("pools",
+                                                           obd->obd_proc_entry,
+                                                           NULL, NULL);
                if (IS_ERR(lov->lov_pool_proc_entry)) {
                        rc = PTR_ERR(lov->lov_pool_proc_entry);
                        CERROR("error %d setting up lprocfs for pools\n", rc);
@@ -883,31 +883,6 @@ out:
        return rc;
 }
 
-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;
-       }
-       default:
-               break;
-       }
-
-       RETURN(rc);
-}
-
 static int lov_cleanup(struct obd_device *obd)
 {
         struct lov_obd *lov = &obd->u.lov;
@@ -945,13 +920,19 @@ static int lov_cleanup(struct obd_device *obd)
                                       "deathrow=%d, lovrc=%d\n",
                                       obd->obd_name, i, lov->lov_death_row,
                                       atomic_read(&lov->lov_refcount));
-                       lov_del_target(obd, i, 0, 0);
+                       lov_del_target(obd, i, NULL, 0);
                }
                 obd_putref(obd);
                 OBD_FREE(lov->lov_tgts, sizeof(*lov->lov_tgts) *
                          lov->lov_tgt_size);
                 lov->lov_tgt_size = 0;
         }
+
+       if (lov->lov_cache != NULL) {
+               cl_cache_decref(lov->lov_cache);
+               lov->lov_cache = NULL;
+       }
+
         RETURN(0);
 }
 
@@ -1017,385 +998,6 @@ out:
         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++) {
-               struct lov_oinfo *loi = lsm->lsm_oinfo[i];
-
-               if (lov_oinfo_is_dummy(loi))
-                       continue;
-
-               if (loi->loi_ost_idx == ost_idx) {
-                       if (ostid_id(&loi->loi_oi) !=
-                                       ostid_id(&src_oa->o_oi))
-                               GOTO(out, rc = -EINVAL);
-                       break;
-               }
-       }
-        if (i == lsm->lsm_stripe_count)
-                GOTO(out, rc = -EINVAL);
-
-        rc = obd_create(NULL, 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(const struct lu_env *env, struct obd_export *exp,
-                      struct obdo *src_oa, struct lov_stripe_md **ea,
-                      struct obd_trans_info *oti)
-{
-        struct lov_obd *lov;
-        int rc = 0;
-        ENTRY;
-
-        LASSERT(ea != NULL);
-        if (exp == NULL)
-                RETURN(-EINVAL);
-
-        if ((src_oa->o_valid & OBD_MD_FLFLAGS) &&
-            src_oa->o_flags == OBD_FL_DELORPHAN) {
-               /* should be used with LOV anymore */
-               LBUG();
-        }
-
-        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);
-        }
-
-        obd_putref(exp->exp_obd);
-        RETURN(rc);
-}
-
-#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(const struct lu_env *env, struct obd_export *exp,
-                       struct obdo *oa, 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;
-        struct lov_obd *lov;
-        int rc = 0, err = 0;
-        ENTRY;
-
-        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;
-        obd_getref(exp->exp_obd);
-        rc = lov_prep_destroy_set(exp, &oinfo, oa, lsm, oti, &set);
-        if (rc)
-                GOTO(out, rc);
-
-       list_for_each(pos, &set->set_list) {
-               req = list_entry(pos, struct lov_request, rq_link);
-
-                if (oa->o_valid & OBD_MD_FLCOOKIE)
-                        oti->oti_logcookies = set->set_cookies + req->rq_stripe;
-
-               err = obd_destroy(env, 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("%s: destroying objid "DOSTID" subobj "
-                              DOSTID" on OST idx %d: rc = %d\n",
-                              exp->exp_obd->obd_name, POSTID(&oa->o_oi),
-                              POSTID(&req->rq_oi.oi_oa->o_oi),
-                              req->rq_idx, err);
-                       if (!rc)
-                               rc = err;
-               }
-        }
-
-        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_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)
-               atomic_set(&lovset->set_completes, 0);
-       err = lov_fini_getattr_set(lovset);
-       RETURN(rc ? rc : err);
-}
-
-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;
-        struct lov_request *req;
-        int rc = 0, err;
-        ENTRY;
-
-        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, oinfo, &lovset);
-        if (rc)
-                RETURN(rc);
-
-       CDEBUG(D_INFO, "objid "DOSTID": %ux%u byte stripes\n",
-              POSTID(&oinfo->oi_md->lsm_oi), oinfo->oi_md->lsm_stripe_count,
-              oinfo->oi_md->lsm_stripe_size);
-
-       list_for_each(pos, &lovset->set_list) {
-               req = list_entry(pos, struct lov_request, rq_link);
-
-               CDEBUG(D_INFO, "objid "DOSTID"[%d] has subobj "DOSTID" at idx"
-                      "%u\n", POSTID(&oinfo->oi_oa->o_oi), req->rq_stripe,
-                      POSTID(&req->rq_oi.oi_oa->o_oi), req->rq_idx);
-               rc = obd_getattr_async(lov->lov_tgts[req->rq_idx]->ltd_exp,
-                                      &req->rq_oi, rqset);
-               if (rc) {
-                       CERROR("%s: getattr objid "DOSTID" subobj"
-                              DOSTID" on OST idx %d: rc = %d\n",
-                              exp->exp_obd->obd_name,
-                              POSTID(&oinfo->oi_oa->o_oi),
-                              POSTID(&req->rq_oi.oi_oa->o_oi),
-                              req->rq_idx, rc);
-                       GOTO(out, rc);
-               }
-       }
-
-       if (!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:
-       if (rc)
-               atomic_set(&lovset->set_completes, 0);
-       err = lov_fini_getattr_set(lovset);
-       RETURN(rc ? rc : err);
-}
-
-static int lov_setattr_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)
-               atomic_set(&lovset->set_completes, 0);
-       err = lov_fini_setattr_set(lovset);
-       RETURN(rc ? rc : err);
-}
-
-/* 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;
-       struct list_head *pos;
-        struct lov_obd *lov;
-        int rc = 0;
-        ENTRY;
-
-        LASSERT(oinfo);
-        ASSERT_LSM_MAGIC(oinfo->oi_md);
-        if (oinfo->oi_oa->o_valid & OBD_MD_FLCOOKIE) {
-                LASSERT(oti);
-                LASSERT(oti->oti_logcookies);
-        }
-
-        if (!exp || !exp->exp_obd)
-                RETURN(-ENODEV);
-
-        lov = &exp->exp_obd->u.lov;
-        rc = lov_prep_setattr_set(exp, oinfo, oti, &set);
-        if (rc)
-                RETURN(rc);
-
-       CDEBUG(D_INFO, "objid "DOSTID": %ux%u byte stripes\n",
-              POSTID(&oinfo->oi_md->lsm_oi),
-              oinfo->oi_md->lsm_stripe_count,
-              oinfo->oi_md->lsm_stripe_size);
-
-       list_for_each(pos, &set->set_list) {
-               req = list_entry(pos, struct lov_request, rq_link);
-
-               if (oinfo->oi_oa->o_valid & OBD_MD_FLCOOKIE)
-                       oti->oti_logcookies = set->set_cookies + req->rq_stripe;
-
-               CDEBUG(D_INFO, "objid "DOSTID"[%d] has subobj "DOSTID" at idx"
-                      "%u\n", POSTID(&oinfo->oi_oa->o_oi), req->rq_stripe,
-                      POSTID(&req->rq_oi.oi_oa->o_oi), req->rq_idx);
-
-               rc = obd_setattr_async(lov->lov_tgts[req->rq_idx]->ltd_exp,
-                                      &req->rq_oi, oti, rqset);
-               if (rc) {
-                       CERROR("error: setattr objid "DOSTID" subobj"
-                              DOSTID" on OST idx %d: rc = %d\n",
-                              POSTID(&set->set_oi->oi_oa->o_oi),
-                              POSTID(&req->rq_oi.oi_oa->o_oi),
-                              req->rq_idx, rc);
-                       break;
-               }
-       }
-
-       /* If we are not waiting for responses on async requests, return. */
-       if (rc || !rqset || list_empty(&rqset->set_requests)) {
-               int err;
-               if (rc)
-                       atomic_set(&set->set_completes, 0);
-               err = lov_fini_setattr_set(set);
-               RETURN(rc ? rc : err);
-       }
-
-       LASSERT(rqset->set_interpret == NULL);
-       rqset->set_interpret = lov_setattr_interpret;
-       rqset->set_arg = (void *)set;
-
-       RETURN(0);
-}
-
-static int lov_change_cbdata(struct obd_export *exp,
-                             struct lov_stripe_md *lsm, ldlm_iterator_t it,
-                             void *data)
-{
-        struct lov_obd *lov;
-        int rc = 0, i;
-        ENTRY;
-
-        ASSERT_LSM_MAGIC(lsm);
-
-        if (!exp || !exp->exp_obd)
-                RETURN(-ENODEV);
-
-        lov = &exp->exp_obd->u.lov;
-        for (i = 0; i < lsm->lsm_stripe_count; i++) {
-                struct lov_stripe_md submd;
-                struct lov_oinfo *loi = lsm->lsm_oinfo[i];
-
-               if (lov_oinfo_is_dummy(loi))
-                       continue;
-
-               if (!lov->lov_tgts[loi->loi_ost_idx]) {
-                       CDEBUG(D_HA, "lov idx %d NULL\n", loi->loi_ost_idx);
-                       continue;
-               }
-
-               submd.lsm_oi = loi->loi_oi;
-               submd.lsm_stripe_count = 0;
-               rc = obd_change_cbdata(lov->lov_tgts[loi->loi_ost_idx]->ltd_exp,
-                                      &submd, it, data);
-       }
-       RETURN(rc);
-}
-
-/* find any ldlm lock of the inode in lov
- * return 0    not find
- *        1    find one
- *      < 0    error */
-static int lov_find_cbdata(struct obd_export *exp,
-                           struct lov_stripe_md *lsm, ldlm_iterator_t it,
-                           void *data)
-{
-        struct lov_obd *lov;
-        int rc = 0, i;
-        ENTRY;
-
-        ASSERT_LSM_MAGIC(lsm);
-
-        if (!exp || !exp->exp_obd)
-                RETURN(-ENODEV);
-
-        lov = &exp->exp_obd->u.lov;
-        for (i = 0; i < lsm->lsm_stripe_count; i++) {
-                struct lov_stripe_md submd;
-                struct lov_oinfo *loi = lsm->lsm_oinfo[i];
-
-               if (lov_oinfo_is_dummy(loi))
-                       continue;
-
-               if (!lov->lov_tgts[loi->loi_ost_idx]) {
-                       CDEBUG(D_HA, "lov idx %d NULL\n", loi->loi_ost_idx);
-                       continue;
-               }
-
-               submd.lsm_oi = loi->loi_oi;
-               submd.lsm_stripe_count = 0;
-               rc = obd_find_cbdata(lov->lov_tgts[loi->loi_ost_idx]->ltd_exp,
-                                    &submd, it, data);
-               if (rc != 0)
-                       RETURN(rc);
-       }
-       RETURN(rc);
-}
-
 int lov_statfs_interpret(struct ptlrpc_request_set *rqset, void *data, int rc)
 {
        struct lov_request_set *lovset = (struct lov_request_set *)data;
@@ -1451,28 +1053,30 @@ static int lov_statfs_async(struct obd_export *exp, struct obd_info *oinfo,
 }
 
 static int lov_statfs(const struct lu_env *env, struct obd_export *exp,
-                      struct obd_statfs *osfs, __u64 max_age, __u32 flags)
+                     struct obd_statfs *osfs, __u64 max_age, __u32 flags)
 {
-        struct ptlrpc_request_set *set = NULL;
-        struct obd_info oinfo = { { { 0 } } };
-        int rc = 0;
-        ENTRY;
+       struct ptlrpc_request_set *set = NULL;
+       struct obd_info oinfo = {
+               .oi_osfs = osfs,
+               .oi_flags = flags,
+       };
+       int rc = 0;
 
+       ENTRY;
 
-        /* for obdclass we forbid using obd_statfs_rqset, but prefer using async
-         * statfs requests */
-        set = ptlrpc_prep_set();
-        if (set == NULL)
-                RETURN(-ENOMEM);
+       /* 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(exp, &oinfo, max_age, set);
-        if (rc == 0)
-                rc = ptlrpc_set_wait(set);
-        ptlrpc_set_destroy(set);
+       rc = lov_statfs_async(exp, &oinfo, max_age, set);
+       if (rc == 0)
+               rc = ptlrpc_set_wait(set);
 
-        RETURN(rc);
+       ptlrpc_set_destroy(set);
+
+       RETURN(rc);
 }
 
 static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
@@ -1492,7 +1096,7 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 __u32 index;
                __u32 flags;
 
-                memcpy(&index, data->ioc_inlbuf2, sizeof(__u32));
+                memcpy(&index, data->ioc_inlbuf2, sizeof(index));
                 if ((index >= count))
                         RETURN(-ENODEV);
 
@@ -1508,11 +1112,13 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
 
                 /* copy UUID */
                if (copy_to_user(data->ioc_pbuf2, obd2cli_tgt(osc_obd),
-                                min((int)data->ioc_plen2,
-                                    (int)sizeof(struct obd_uuid))))
-                        RETURN(-EFAULT);
+                                min_t(unsigned long, data->ioc_plen2,
+                                      sizeof(struct obd_uuid))))
+                       RETURN(-EFAULT);
+
+               memcpy(&flags, data->ioc_inlbuf1, sizeof(flags));
+               flags = flags & LL_STATFS_NODELAY ? OBD_STATFS_NODELAY : 0;
 
-               flags = uarg ? *(__u32 __user *)uarg : 0;
                 /* got statfs data */
                 rc = obd_statfs(NULL, lov->lov_tgts[index]->ltd_exp, &stat_buf,
                                 cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
@@ -1520,10 +1126,10 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 if (rc)
                         RETURN(rc);
                if (copy_to_user(data->ioc_pbuf1, &stat_buf,
-                                     min((int) data->ioc_plen1,
-                                         (int) sizeof(stat_buf))))
-                        RETURN(-EFAULT);
-                break;
+                                min_t(unsigned long, data->ioc_plen1,
+                                      sizeof(struct obd_statfs))))
+                       RETURN(-EFAULT);
+               break;
         }
         case OBD_IOC_LOV_GET_CONFIG: {
                 struct obd_ioctl_data *data;
@@ -1570,9 +1176,6 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 obd_ioctl_freedata(buf, len);
                 break;
         }
-       case LL_IOC_LOV_GETSTRIPE:
-               rc = lov_getstripe(exp, karg, uarg);
-               break;
         case OBD_IOC_QUOTACTL: {
                 struct if_quotactl *qctl = karg;
                 struct lov_tgt_desc *tgt = NULL;
@@ -1640,9 +1243,7 @@ static int lov_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                         osc_obd->obd_force = obddev->obd_force;
                         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 (err) {
                                 if (lov->lov_tgts[i]->ltd_active) {
                                         CDEBUG(err == -ENOTTY ?
                                                D_IOCTL : D_WARNING,
@@ -1665,506 +1266,57 @@ 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++) {
-               struct lov_oinfo *oinfo = lsm->lsm_oinfo[i];
-
-               if (lov_oinfo_is_dummy(oinfo))
-                       continue;
-
-               if (oinfo->loi_ost_idx == fiemap->fm_extents[0].fe_device) {
-                       stripe_no = i;
-                       break;
-               }
-       }
-
-       if (stripe_no == -1)
-               return -EINVAL;
-
-        /* 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;
-        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_has_objects(lsm)) {
-               if (lsm && lsm_is_released(lsm) && (fm_key->fiemap.fm_start <
-                   fm_key->oa.o_size)) {
-                       /* released file, return a minimal FIEMAP if
-                        * request fits in file-size.
-                        */
-                       fiemap->fm_mapped_extents = 1;
-                       fiemap->fm_extents[0].fe_logical =
-                                               fm_key->fiemap.fm_start;
-                       if (fm_key->fiemap.fm_start + fm_key->fiemap.fm_length <
-                           fm_key->oa.o_size)
-                               fiemap->fm_extents[0].fe_length =
-                                               fm_key->fiemap.fm_length;
-                       else
-                               fiemap->fm_extents[0].fe_length =
-                                               fm_key->oa.o_size -
-                                               fm_key->fiemap.fm_start;
-                       fiemap->fm_extents[0].fe_flags |=
-                                               (FIEMAP_EXTENT_UNKNOWN |
-                                                FIEMAP_EXTENT_LAST);
-               }
-               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_LARGE(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 (fm_end_offset == -EINVAL)
-               GOTO(out, rc = -EINVAL);
-
-       if (fiemap_count_to_size(fiemap->fm_extent_count) > *vallen)
-               fiemap->fm_extent_count = fiemap_size_to_count(*vallen);
-       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 (lov_oinfo_is_dummy(lsm->lsm_oinfo[cur_stripe]))
-                       GOTO(out, rc = -EIO);
-
-                /* 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_oi = lsm->lsm_oinfo[cur_stripe]->loi_oi;
-                        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(NULL,
-                                          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:
-       if (fm_local)
-               OBD_FREE_LARGE(fm_local, buffer_size);
-        return rc;
-}
-
 static int lov_get_info(const struct lu_env *env, struct obd_export *exp,
-                        __u32 keylen, void *key, __u32 *vallen, void *val,
-                        struct lov_stripe_md *lsm)
+                       __u32 keylen, void *key, __u32 *vallen, void *val)
 {
-        struct obd_device *obddev = class_exp2obd(exp);
-        struct lov_obd *lov = &obddev->u.lov;
-        int i, rc;
-        ENTRY;
-
-        if (!vallen || !val)
-                RETURN(-EFAULT);
-
-        obd_getref(obddev);
-
-        if (KEY_IS(KEY_LOCK_TO_STRIPE)) {
-                struct {
-                        char name[16];
-                        struct ldlm_lock *lock;
-                } *data = key;
-                struct ldlm_res_id *res_id = &data->lock->l_resource->lr_name;
-                struct lov_oinfo *loi;
-                __u32 *stripe = val;
-
-                if (*vallen < sizeof(*stripe))
-                        GOTO(out, rc = -EFAULT);
-                *vallen = sizeof(*stripe);
-
-                /* XXX This is another one of those bits that will need to
-                 * change if we ever actually support nested LOVs.  It uses
-                 * the lock's export to find out which stripe it is. */
-                /* 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. */
-                for (i = 0; i < lsm->lsm_stripe_count; i++) {
-                        loi = lsm->lsm_oinfo[i];
-                       if (lov_oinfo_is_dummy(loi))
-                               continue;
+       struct obd_device *obddev = class_exp2obd(exp);
+       struct lov_obd *lov = &obddev->u.lov;
+       struct lov_desc *ld = &lov->desc;
+       int rc = 0;
+       ENTRY;
 
-                        if (!lov->lov_tgts[loi->loi_ost_idx])
-                                continue;
-                       if (lov->lov_tgts[loi->loi_ost_idx]->ltd_exp ==
-                           data->lock->l_conn_export &&
-                           ostid_res_name_eq(&loi->loi_oi, res_id)) {
-                               *stripe = i;
-                               GOTO(out, rc = 0);
-                       }
-                }
-                LDLM_ERROR(data->lock, "lock on inode without such object");
-                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;
-
-                LASSERT(*vallen == sizeof(struct obd_id_info));
-                tgt = lov->lov_tgts[info->idx];
-
-                if (!tgt || !tgt->ltd_active)
-                        GOTO(out, rc = -ESRCH);
-
-                rc = obd_get_info(env, 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;
+       if (vallen == NULL || val == NULL)
+               RETURN(-EFAULT);
 
-                GOTO(out, rc = 0);
-        } else if (KEY_IS(KEY_FIEMAP)) {
-                rc = lov_fiemap(lov, keylen, key, vallen, val, lsm);
-                GOTO(out, rc);
-        } else if (KEY_IS(KEY_CONNECT_FLAG)) {
-                struct lov_tgt_desc *tgt;
-                __u64 ost_idx = *((__u64*)val);
+       obd_getref(obddev);
 
-                LASSERT(*vallen == sizeof(__u64));
-                LASSERT(ost_idx < lov->desc.ld_tgt_count);
-                tgt = lov->lov_tgts[ost_idx];
+       if (KEY_IS(KEY_MAX_EASIZE)) {
+               u32 max_stripe_count = min_t(u32, ld->ld_active_tgt_count,
+                                            LOV_MAX_STRIPE_COUNT);
 
-                if (!tgt || !tgt->ltd_exp)
-                        GOTO(out, rc = -ESRCH);
+               *((u32 *)val) = lov_mds_md_size(max_stripe_count, LOV_MAGIC_V3);
+       } else if (KEY_IS(KEY_DEFAULT_EASIZE)) {
+               u32 def_stripe_count = min_t(u32, ld->ld_default_stripe_count,
+                                            LOV_MAX_STRIPE_COUNT);
 
-               *((__u64 *)val) = exp_connect_flags(tgt->ltd_exp);
-                GOTO(out, rc = 0);
-        } else if (KEY_IS(KEY_TGT_COUNT)) {
-                *((int *)val) = lov->desc.ld_tgt_count;
-                GOTO(out, rc = 0);
-        }
+               *((u32 *)val) = lov_mds_md_size(def_stripe_count, LOV_MAGIC_V3);
+       } else if (KEY_IS(KEY_TGT_COUNT)) {
+               *((int *)val) = lov->desc.ld_tgt_count;
+       } else {
+               rc = -EINVAL;
+       }
 
-        rc = -EINVAL;
+       obd_putref(obddev);
 
-out:
-        obd_putref(obddev);
-        RETURN(rc);
+       RETURN(rc);
 }
 
 static int lov_set_info_async(const struct lu_env *env, struct obd_export *exp,
-                              obd_count keylen, void *key, obd_count vallen,
-                              void *val, struct ptlrpc_request_set *set)
+                             __u32 keylen, void *key,
+                             __u32 vallen, void *val,
+                             struct ptlrpc_request_set *set)
 {
-        struct obd_device *obddev = class_exp2obd(exp);
-        struct lov_obd *lov = &obddev->u.lov;
-        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;
+       struct obd_device *obddev = class_exp2obd(exp);
+       struct lov_obd *lov = &obddev->u.lov;
+       struct lov_tgt_desc *tgt;
+       int do_inactive = 0;
+       int no_set = 0;
+       u32 count;
+       u32 i;
+       int rc = 0;
+       int err;
         ENTRY;
 
-        incr = check_uuid = do_inactive = no_set = 0;
         if (set == NULL) {
                 no_set = 1;
                 set = ptlrpc_prep_set();
@@ -2175,32 +1327,18 @@ static int lov_set_info_async(const struct lu_env *env, struct obd_export *exp,
         obd_getref(obddev);
         count = lov->desc.ld_tgt_count;
 
-        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)) {
+       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;
        } else if (KEY_IS(KEY_CACHE_SET)) {
                LASSERT(lov->lov_cache == NULL);
                lov->lov_cache = val;
                do_inactive = 1;
+               cl_cache_incref(lov->lov_cache);
        }
 
-        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];
-                }
+       for (i = 0; i < count; i++) {
+               tgt = lov->lov_tgts[i];
+
                 /* OST was disconnected */
                 if (!tgt || !tgt->ltd_exp)
                         continue;
@@ -2209,47 +1347,8 @@ static int lov_set_info_async(const struct lu_env *env, struct obd_export *exp,
                 if (!tgt->ltd_active && !do_inactive)
                         continue;
 
-                if (mds_con) {
-                        struct mds_group_info *mgi;
-
-                        LASSERT(vallen == sizeof(*mgi));
-                        mgi = (struct mds_group_info *)val;
-
-                        /* Only want a specific OSC */
-                        if (mgi->uuid && !obd_uuid_equals(mgi->uuid,
-                                                &tgt->ltd_uuid))
-                                continue;
-
-                        err = obd_set_info_async(env, tgt->ltd_exp,
-                                         keylen, key, sizeof(int),
-                                         &mgi->group, set);
-                } else if (next_id) {
-                        err = obd_set_info_async(env, 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;
-
-                        err = obd_set_info_async(env, 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;
-
-                        err = obd_set_info_async(env, tgt->ltd_exp,
-                                         keylen, key, vallen, val, set);
-                }
-
+               err = obd_set_info_async(env, tgt->ltd_exp, keylen, key,
+                                        vallen, val, set);
                 if (!rc)
                         rc = err;
         }
@@ -2291,12 +1390,8 @@ static int lov_quotactl(struct obd_device *obd, struct obd_export *exp,
         int                  i, rc = 0;
         ENTRY;
 
-        if (oqctl->qc_cmd != LUSTRE_Q_QUOTAON &&
-            oqctl->qc_cmd != LUSTRE_Q_QUOTAOFF &&
-            oqctl->qc_cmd != Q_GETOQUOTA &&
-            oqctl->qc_cmd != Q_INITQUOTA &&
-            oqctl->qc_cmd != LUSTRE_Q_SETQUOTA &&
-            oqctl->qc_cmd != Q_FINVALIDATE) {
+       if (oqctl->qc_cmd != Q_GETOQUOTA &&
+           oqctl->qc_cmd != LUSTRE_Q_SETQUOTA) {
                CERROR("%s: bad quota opc %x for lov obd\n",
                       obd->obd_name, oqctl->qc_cmd);
                RETURN(-EFAULT);
@@ -2344,67 +1439,14 @@ static int lov_quotactl(struct obd_device *obd, struct obd_export *exp,
         RETURN(rc);
 }
 
-static int lov_quotacheck(struct obd_device *obd, struct obd_export *exp,
-                          struct obd_quotactl *oqctl)
-{
-        struct lov_obd *lov = &obd->u.lov;
-        int             i, rc = 0;
-        ENTRY;
-
-        obd_getref(obd);
-
-        for (i = 0; i < lov->desc.ld_tgt_count; i++) {
-                if (!lov->lov_tgts[i])
-                        continue;
-
-                /* Skip quota check on the administratively disabled OSTs. */
-                if (!lov->lov_tgts[i]->ltd_activate) {
-                        CWARN("lov idx %d was administratively disabled, "
-                              "skip quotacheck on it.\n", i);
-                        continue;
-                }
-
-                if (!lov->lov_tgts[i]->ltd_active) {
-                        CERROR("lov idx %d inactive\n", i);
-                        rc = -EIO;
-                        goto out;
-                }
-        }
-
-        for (i = 0; i < lov->desc.ld_tgt_count; i++) {
-                int err;
-
-                if (!lov->lov_tgts[i] || !lov->lov_tgts[i]->ltd_activate)
-                        continue;
-
-                err = obd_quotacheck(lov->lov_tgts[i]->ltd_exp, oqctl);
-                if (err && !rc)
-                        rc = err;
-        }
-
-out:
-        obd_putref(obd);
-
-        RETURN(rc);
-}
-
 static struct obd_ops lov_obd_ops = {
        .o_owner                = THIS_MODULE,
        .o_setup                = lov_setup,
-       .o_precleanup           = lov_precleanup,
        .o_cleanup              = lov_cleanup,
        .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_create               = lov_create,
-       .o_destroy              = lov_destroy,
-       .o_getattr_async        = lov_getattr_async,
-       .o_setattr_async        = lov_setattr_async,
-       .o_change_cbdata        = lov_change_cbdata,
-       .o_find_cbdata          = lov_find_cbdata,
        .o_iocontrol            = lov_iocontrol,
        .o_get_info             = lov_get_info,
        .o_set_info_async       = lov_set_info_async,
@@ -2416,14 +1458,11 @@ static struct obd_ops lov_obd_ops = {
        .o_getref               = lov_getref,
        .o_putref               = lov_putref,
        .o_quotactl             = lov_quotactl,
-       .o_quotacheck           = lov_quotacheck,
 };
 
 struct kmem_cache *lov_oinfo_slab;
 
-extern struct lu_kmem_descr lov_caches[];
-
-int __init lov_init(void)
+static int __init lov_init(void)
 {
        bool enable_proc = true;
        struct obd_type *type;
@@ -2462,15 +1501,17 @@ int __init lov_init(void)
         RETURN(rc);
 }
 
-static void /*__exit*/ lov_exit(void)
+static void __exit lov_exit(void)
 {
        class_unregister_type(LUSTRE_LOV_NAME);
        kmem_cache_destroy(lov_oinfo_slab);
        lu_kmem_fini(lov_caches);
 }
 
-MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
-MODULE_DESCRIPTION("Lustre Logical Object Volume OBD driver");
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
+MODULE_DESCRIPTION("Lustre Logical Object Volume");
+MODULE_VERSION(LUSTRE_VERSION_STRING);
 MODULE_LICENSE("GPL");
 
-cfs_module(lov, LUSTRE_VERSION_STRING, lov_init, lov_exit);
+module_init(lov_init);
+module_exit(lov_exit);