Revert "LU-2459 osd: add LMA incompat flag check"

[fs/lustre-release.git] / lustre / lod / lod_dev.c

diff --git a/lustre/lod/lod_dev.c b/lustre/lod/lod_dev.c
index 17dca0c..b7440cb 100644 (file)
--- a/lustre/lod/lod_dev.c
+++ b/lustre/lod/lod_dev.c
@@ -56,12 +56,12 @@
  * \param lod LOD to be lookup at.
  * \param fid FID of object to find MDT/OST.
  * \param tgt MDT/OST index to return.
- * \param flags indidcate the FID is on MDS or OST.
+ * \param type indidcate the FID is on MDS or OST.
  **/
 int lod_fld_lookup(const struct lu_env *env, struct lod_device *lod,
-                  const struct lu_fid *fid, __u32 *tgt, int flags)
+                  const struct lu_fid *fid, __u32 *tgt, int type)
 {
-       struct lu_seq_range     range;
+       struct lu_seq_range     range = { 0 };
        struct lu_server_fld    *server_fld;
        int rc = 0;
        ENTRY;
@@ -79,7 +79,7 @@ int lod_fld_lookup(const struct lu_env *env, struct lod_device *lod,
        }
 
        server_fld = lu_site2seq(lod2lu_dev(lod)->ld_site)->ss_server_fld;
-       range.lsr_flags = flags;
+       fld_range_set_type(&range, type);
        rc = fld_server_lookup(env, server_fld, fid_seq(fid), &range);
        if (rc) {
                CERROR("%s: Can't find tgt by seq "LPX64", rc %d\n",
@@ -98,7 +98,6 @@ int lod_fld_lookup(const struct lu_env *env, struct lod_device *lod,
 extern struct lu_object_operations lod_lu_obj_ops;
 extern struct lu_object_operations lod_lu_robj_ops;
 extern struct dt_object_operations lod_obj_ops;
-extern struct dt_lock_operations   lod_lock_ops;
 
 /* Slab for OSD object allocation */
 cfs_mem_cache_t *lod_object_kmem;
@@ -142,7 +141,6 @@ struct lu_object *lod_object_alloc(const struct lu_env *env,
        lu_obj = lod2lu_obj(lod_obj);
        dt_object_init(&lod_obj->ldo_obj, NULL, dev);
        lod_obj->ldo_obj.do_ops = &lod_obj_ops;
-       lod_obj->ldo_obj.do_lock_ops = &lod_lock_ops;
        if (likely(mds == lu_site2seq(dev->ld_site)->ss_node_id))
                lu_obj->lo_ops = &lod_lu_obj_ops;
        else