LU-1187 osd: allocate osd_compat_objid_seq dynamically

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_oi.c

diff --git a/lustre/osd-ldiskfs/osd_oi.c b/lustre/osd-ldiskfs/osd_oi.c
index 29e7b92..30d2f54 100644 (file)
--- a/lustre/osd-ldiskfs/osd_oi.c
+++ b/lustre/osd-ldiskfs/osd_oi.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -78,7 +78,7 @@ CFS_MODULE_PARM(osd_oi_count, "i", int, 0444,
                 "it's only valid for new filesystem.");
 
 /** to serialize concurrent OI index initialization */
-static cfs_mutex_t oi_init_lock;
+static struct mutex oi_init_lock;
 
 static struct dt_index_features oi_feat = {
         .dif_flags       = DT_IND_UPDATE,
@@ -350,7 +350,7 @@ int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd)
        if (oi == NULL)
                RETURN(-ENOMEM);
 
-       cfs_mutex_lock(&oi_init_lock);
+       mutex_lock(&oi_init_lock);
        /* try to open existing multiple OIs first */
        rc = osd_oi_table_open(info, osd, oi, sf->sf_oi_count, false);
        if (rc < 0)
@@ -413,7 +413,7 @@ out:
                rc = 0;
        }
 
-       cfs_mutex_unlock(&oi_init_lock);
+       mutex_unlock(&oi_init_lock);
        return rc;
 }
 
@@ -504,7 +504,8 @@ int osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd,
 
         if (fid_is_idif(fid) || fid_seq(fid) == FID_SEQ_LLOG) {
                 /* old OSD obj id */
-                rc = osd_compat_objid_lookup(info, osd, fid, id);
+               /* FIXME: actually for all of the OST object */
+               rc = osd_obj_map_lookup(info, osd, fid, id);
         } else if (fid_is_igif(fid)) {
                 lu_igif_to_id(fid, id);
         } else if (fid_is_fs_root(fid)) {
@@ -515,7 +516,7 @@ int osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd,
                        return osd_acct_obj_lookup(info, osd, fid, id);
 
                if (unlikely(fid_seq(fid) == FID_SEQ_LOCAL_FILE))
-                       return osd_compat_spec_lookup(info, osd, fid, id);
+                       return osd_obj_spec_lookup(info, osd, fid, id);
 
                rc = __osd_oi_lookup(info, osd, fid, id);
         }
@@ -568,11 +569,11 @@ int osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd,
                return 0;
 
        if (fid_is_idif(fid) || fid_seq(fid) == FID_SEQ_LLOG)
-               return osd_compat_objid_insert(info, osd, fid, id, th);
+               return osd_obj_map_insert(info, osd, fid, id, th);
 
        /* Server mount should not depends on OI files */
        if (unlikely(fid_seq(fid) == FID_SEQ_LOCAL_FILE))
-               return osd_compat_spec_insert(info, osd, fid, id, th);
+               return osd_obj_spec_insert(info, osd, fid, id, th);
 
        fid_cpu_to_be(oi_fid, fid);
        osd_id_pack(oi_id, id);
@@ -621,7 +622,7 @@ int osd_oi_delete(struct osd_thread_info *info,
        LASSERT(fid_seq(fid) != FID_SEQ_LOCAL_FILE);
 
        if (fid_is_idif(fid) || fid_seq(fid) == FID_SEQ_LLOG)
-               return osd_compat_objid_delete(info, osd, fid, th);
+               return osd_obj_map_delete(info, osd, fid, th);
 
        fid_cpu_to_be(oi_fid, fid);
        return osd_oi_iam_delete(info, osd_fid2oi(osd, fid),
@@ -639,6 +640,6 @@ int osd_oi_mod_init(void)
                 osd_oi_count = size_roundup_power2(osd_oi_count);
         }
 
-        cfs_mutex_init(&oi_init_lock);
+       mutex_init(&oi_init_lock);
         return 0;
 }