LU-1187 tests: Add mntfmt/mntcount/mdtcount to mdsrate

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

diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c
index 0df1568..e629821 100644 (file)
--- a/lustre/osd-zfs/osd_oi.c
+++ b/lustre/osd-zfs/osd_oi.c
@@ -28,7 +28,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2011, 2012 Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  * Use is subject to license terms.
  */
 /*
@@ -93,14 +93,13 @@ static const struct named_oid oids[] = {
        { OFD_LAST_GROUP_OID,           "LAST_GROUP" },
        { LLOG_CATALOGS_OID,            "CATALOGS" },
        { MGS_CONFIGS_OID,              NULL /*MOUNT_CONFIGS_DIR*/ },
-       { FID_SEQ_SRV_OID,              NULL /* "seq_srv" */},
-       { FID_SEQ_CTL_OID,              NULL /*"seq_ctl"*/ },
+       { FID_SEQ_SRV_OID,              "seq_srv" },
+       { FID_SEQ_CTL_OID,              "seq_ctl" },
        { MDD_CAPA_KEYS_OID,            NULL /*CAPA_KEYS*/ },
-       { FLD_INDEX_OID,                NULL /* "fld" */ },
+       { FLD_INDEX_OID,                "fld" },
        { MDD_LOV_OBJ_OID,              LOV_OBJID },
        { MDT_LAST_RECV_OID,            LAST_RCVD },
        { OFD_HEALTH_CHECK_OID,         HEALTH_CHECK },
-       { OFD_GROUP0_LAST_OID,          "LAST_ID" },
        { ACCT_USER_OID,                "acct_usr_inode" },
        { ACCT_GROUP_OID,               "acct_grp_inode" },
        { MDD_ROOT_INDEX_OID,           NULL },
@@ -177,6 +176,8 @@ uint64_t osd_get_name_n_idx(const struct lu_env *env, struct osd_device *osd,
 
        if (fid_is_idif(fid)) {
                zapid = osd_get_idx_for_ost_obj(env, osd, fid, buf);
+       } else if (fid_is_last_id(fid)) {
+               zapid = osd->od_ost_compat_grp0;
        } else if (unlikely(fid_seq(fid) == FID_SEQ_LOCAL_FILE)) {
                /* special objects with fixed known fids get their name */
                char *name = oid2name(fid_oid(fid));
@@ -184,9 +185,7 @@ uint64_t osd_get_name_n_idx(const struct lu_env *env, struct osd_device *osd,
                if (name) {
                        zapid = osd->od_root;
                        strcpy(buf, name);
-                       if (fid_oid(fid) == OFD_GROUP0_LAST_OID)
-                               zapid = osd->od_ost_compat_grp0;
-                       else if (fid_is_acct(fid))
+                       if (fid_is_acct(fid))
                                zapid = MASTER_NODE_OBJ;
                } else {
                        zapid = osd_get_idx_for_fid(osd, fid, buf);