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 737e8d3..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,
@@ -287,7 +287,6 @@ static int
 osd_oi_table_open(struct osd_thread_info *info, struct osd_device *osd,
                  struct osd_oi **oi_table, unsigned oi_count, bool create)
 {
-       struct dt_device  *dev = &osd->od_dt_dev;
        struct scrub_file *sf = &osd->od_scrub.os_file;
        int                count = 0;
        int                rc = 0;
@@ -322,11 +321,12 @@ osd_oi_table_open(struct osd_thread_info *info, struct osd_device *osd,
                        continue;
                }
 
-               CERROR("%s: can't open %s: rc = %d\n",
-                      dev->dd_lu_dev.ld_obd->obd_name, name, rc);
+               CERROR("%.16s: can't open %s: rc = %d\n",
+                      LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name, name, rc);
                if (oi_count > 0)
-                       CERROR("%s: expect to open total %d OI files.\n",
-                              dev->dd_lu_dev.ld_obd->obd_name, oi_count);
+                       CERROR("%.16s: expect to open total %d OI files.\n",
+                              LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name,
+                              oi_count);
                break;
        }
 
@@ -340,7 +340,6 @@ osd_oi_table_open(struct osd_thread_info *info, struct osd_device *osd,
 
 int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd)
 {
-       struct dt_device  *dev = &osd->od_dt_dev;
        struct osd_scrub  *scrub = &osd->od_scrub;
        struct scrub_file *sf = &scrub->os_file;
        struct osd_oi    **oi;
@@ -351,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)
@@ -373,8 +372,9 @@ int osd_oi_init(struct osd_thread_info *info, struct osd_device *osd)
        if (rc == 0) { /* found single OI from old filesystem */
                GOTO(out, rc = 1);
        } else if (rc != -ENOENT) {
-               CERROR("%s: can't open %s: rc = %d\n",
-                      dev->dd_lu_dev.ld_obd->obd_name, OSD_OI_NAME_BASE, rc);
+               CERROR("%.16s: can't open %s: rc = %d\n",
+                      LDISKFS_SB(osd_sb(osd))->s_es->s_volume_name,
+                      OSD_OI_NAME_BASE, rc);
                GOTO(out, rc);
        }
 
@@ -413,12 +413,15 @@ out:
                rc = 0;
        }
 
-       cfs_mutex_unlock(&oi_init_lock);
+       mutex_unlock(&oi_init_lock);
        return rc;
 }
 
 void osd_oi_fini(struct osd_thread_info *info, struct osd_device *osd)
 {
+       if (unlikely(osd->od_oi_table == NULL))
+               return;
+
         osd_oi_table_put(info, osd->od_oi_table, osd->od_oi_count);
 
         OBD_FREE(osd->od_oi_table,
@@ -501,15 +504,19 @@ 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)) {
                osd_id_gen(id, osd_sb(osd)->s_root->d_inode->i_ino,
                           osd_sb(osd)->s_root->d_inode->i_generation);
        } else {
+               if (unlikely(fid_is_acct(fid)))
+                       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);
         }
@@ -525,13 +532,11 @@ static int osd_oi_iam_insert(struct osd_thread_info *oti, struct osd_oi *oi,
         struct iam_path_descr *ipd;
         struct osd_thandle    *oh;
         int                    rc;
-#ifdef HAVE_QUOTA_SUPPORT
-        cfs_cap_t              save    = cfs_curproc_cap_pack();
-#endif
         ENTRY;
 
         LASSERT(oi);
         LASSERT(oi->oi_inode);
+       ll_vfs_dq_init(oi->oi_inode);
 
         bag = &oi->oi_dir.od_container;
         ipd = osd_idx_ipd_get(oti->oti_env, bag);
@@ -541,9 +546,6 @@ static int osd_oi_iam_insert(struct osd_thread_info *oti, struct osd_oi *oi,
         oh = container_of0(th, struct osd_thandle, ot_super);
         LASSERT(oh->ot_handle != NULL);
         LASSERT(oh->ot_handle->h_transaction != NULL);
-#ifdef HAVE_QUOTA_SUPPORT
-       cfs_cap_raise(CFS_CAP_SYS_RESOURCE);
-#endif
         if (S_ISDIR(oi->oi_inode->i_mode))
                 osd_fid_pack((struct osd_fid_pack *)iam_rec, rec,
                              &oti->oti_fid);
@@ -551,9 +553,6 @@ static int osd_oi_iam_insert(struct osd_thread_info *oti, struct osd_oi *oi,
                 iam_rec = (struct iam_rec *) rec;
         rc = iam_insert(oh->ot_handle, bag, (const struct iam_key *)key,
                         iam_rec, ipd);
-#ifdef HAVE_QUOTA_SUPPORT
-        cfs_curproc_cap_unpack(save);
-#endif
         osd_ipd_put(oti->oti_env, bag, ipd);
         LINVRNT(osd_invariant(obj));
         RETURN(rc);
@@ -570,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);
@@ -593,6 +592,8 @@ static int osd_oi_iam_delete(struct osd_thread_info *oti, struct osd_oi *oi,
         ENTRY;
 
         LASSERT(oi);
+       LASSERT(oi->oi_inode);
+       ll_vfs_dq_init(oi->oi_inode);
 
         bag = &oi->oi_dir.od_container;
         ipd = osd_idx_ipd_get(oti->oti_env, bag);
@@ -615,10 +616,13 @@ int osd_oi_delete(struct osd_thread_info *info,
 {
        struct lu_fid *oi_fid = &info->oti_fid2;
 
+       if (fid_is_igif(fid))
+               return 0;
+
        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),
@@ -636,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;
 }