- fix constants naming

diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h
index d4f286d..072d421 100644 (file)
--- a/lustre/include/lustre_fid.h
+++ b/lustre/include/lustre_fid.h
@@ -92,6 +92,9 @@ enum {
  * used sparingly until ldiskfs-based MDT backends and/or IGIF FIDs 
  * have been completely removed. */
 
+/** special fid seq: used for llog objects. */
+#define LU_LLOG_LUSTRE_SEQ       (FID_SEQ_START + 0x03ULL)
+
 /** special OID for local objects */
 enum {
         /** \see osd_oi_index_create */
@@ -112,10 +115,10 @@ enum {
         /** \see osd_mod_init */
         OSD_REM_OBJ_DIR_OID     = 12UL,
         OFD_LAST_RECV_OID       = 19UL,
-        OFD_GROUP0_LAST_ID      = 20UL,
-        OFD_GROUP4K_LAST_ID     = 20UL+4096,
-        OFD_LAST_GROUP          = 4117UL,
-        OFD_LLOG_CATALOGS       = 4118UL
+        OFD_GROUP0_LAST_OID     = 20UL,
+        OFD_GROUP4K_LAST_OID    = 20UL+4096,
+        OFD_LAST_GROUP_OID      = 4117UL,
+        LLOG_CATALOGS_OID       = 4118UL
 };
 
 static inline void lu_local_obj_fid(struct lu_fid *fid, __u32 oid)

diff --git a/lustre/ofd/ofd_fs.c b/lustre/ofd/ofd_fs.c
index b0b2195..9ebd419 100644 (file)
--- a/lustre/ofd/ofd_fs.c
+++ b/lustre/ofd/ofd_fs.c
@@ -157,7 +157,7 @@ int filter_group_load(const struct lu_env *env,
         if (ofd->ofd_lastid_obj[group])
                 GOTO(cleanup, rc = 0);
 
-        lu_local_obj_fid(&fid, OFD_GROUP0_LAST_ID + group);
+        lu_local_obj_fid(&fid, OFD_GROUP0_LAST_OID + group);
         memset(&attr, 0, sizeof(attr));
         attr.la_valid = LA_MODE;
         attr.la_mode = S_IFREG | 0666;

diff --git a/lustre/ofd/ofd_recovery.c b/lustre/ofd/ofd_recovery.c
index 6f61a0d..808b13b 100644 (file)
--- a/lustre/ofd/ofd_recovery.c
+++ b/lustre/ofd/ofd_recovery.c
@@ -290,7 +290,7 @@ int filter_fs_setup(const struct lu_env *env, struct filter_device *ofd,
         rc = lut_init2(env, &ofd->ofd_lut, obd, ofd->ofd_osd, &fid);
         LASSERT(rc == 0);
 
-        lu_local_obj_fid(&fid, OFD_LAST_GROUP);
+        lu_local_obj_fid(&fid, OFD_LAST_GROUP_OID);
         memset(&attr, 0, sizeof(attr));
         attr.la_valid = LA_MODE;
         attr.la_mode = S_IFREG | 0666;

diff --git a/lustre/osd/osd_compat.c b/lustre/osd/osd_compat.c
index 6ca648d..645afbd 100644 (file)
--- a/lustre/osd/osd_compat.c
+++ b/lustre/osd/osd_compat.c
@@ -631,19 +631,22 @@ int osd_compat_spec_insert(struct osd_thread_info *info, struct osd_device *osd,
         if (fid_oid(fid) == OFD_LAST_RECV_OID) {
                 rc = osd_compat_add_entry(info, osd, root, "last_rcvd", id, th);
 
-        } else if (fid_oid(fid) >= OFD_GROUP0_LAST_ID &&
-                        fid_oid(fid) < OFD_GROUP4K_LAST_ID) {
+        } else if (fid_oid(fid) >= OFD_GROUP0_LAST_OID &&
+                        fid_oid(fid) < OFD_GROUP4K_LAST_OID) {
                 /* on creation of LAST_ID we create O/<group> hierarchy */
-                group = fid_oid(fid) - OFD_GROUP0_LAST_ID;
+                group = fid_oid(fid) - OFD_GROUP0_LAST_OID;
                 rc = osd_compat_load_or_make_group(osd, group);
                 if (rc)
                         GOTO(cleanup, rc);
                 rc = osd_compat_add_entry(info, osd, map->groups[group].groot,
                                           "LAST_ID", id, th);
 
-        } else if (fid_oid(fid) == OFD_LAST_GROUP) {
+        } else if (fid_oid(fid) == OFD_LAST_GROUP_OID) {
                 /* on creation of LAST_GROUP we create legacy OST hierarchy */
                 rc = osd_compat_add_entry(info, osd, root, "LAST_GROUP", id, th);
+        } else if (fid_oid(fid) == LLOG_CATALOGS_OID) {
+                /* on creation of LAST_GROUP we create legacy OST hierarchy */
+                rc = osd_compat_add_entry(info, osd, root, "CATALOGS", id, th);
         } else {
                 /* unknown special file: probably OI can handle this */
         }