LU-2154 osp: osd-zfs: remove 2.3.x debugging code

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

diff --git a/lustre/osd-zfs/osd_index.c b/lustre/osd-zfs/osd_index.c
index f88958c..864b925 100644 (file)
--- a/lustre/osd-zfs/osd_index.c
+++ b/lustre/osd-zfs/osd_index.c
@@ -556,27 +556,21 @@ static int osd_dir_insert(const struct lu_env *env, struct dt_object *dt,
                if (IS_ERR(child))
                        RETURN(PTR_ERR(child));
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 3, 91, 0)
-#define OSD_ZFS_INSERT_DOTS_FOR_TESTING__
-#endif
                LASSERT(child->oo_db);
                if (name[0] == '.') {
                        if (name[1] == 0) {
                                /* do not store ".", instead generate it
                                 * during iteration */
-#ifndef OSD_ZFS_INSERT_DOTS_FOR_TESTING
                                GOTO(out, rc = 0);
-#endif
                        } else if (name[1] == '.' && name[2] == 0) {
                                /* update parent dnode in the child.
                                 * later it will be used to generate ".." */
                                udmu_objset_t *uos = &osd->od_objset;
-                               rc = osd_object_sa_update(parent, SA_ZPL_PARENT(uos),
-                                                         &child->oo_db->db_object,
-                                                         8, oh);
-#ifndef OSD_ZFS_INSERT_DOTS_FOR_TESTING
+                               rc = osd_object_sa_update(parent,
+                                                SA_ZPL_PARENT(uos),
+                                                &child->oo_db->db_object,
+                                                8, oh);
                                GOTO(out, rc);
-#endif
                        }
                }
                CLASSERT(sizeof(oti->oti_zde.lzd_reg) == 8);
@@ -592,9 +586,7 @@ static int osd_dir_insert(const struct lu_env *env, struct dt_object *dt,
                      (char *)key, 8, sizeof(oti->oti_zde) / 8,
                      (void *)&oti->oti_zde, oh->ot_tx);
 
-#ifndef OSD_ZFS_INSERT_DOTS_FOR_TESTING
 out:
-#endif
        if (child != NULL)
                osd_object_put(env, child);
 
@@ -642,10 +634,9 @@ static int osd_dir_delete(const struct lu_env *env, struct dt_object *dt,
        LASSERT(th != NULL);
        oh = container_of0(th, struct osd_thandle, ot_super);
 
-#ifndef OSD_ZFS_INSERT_DOTS_FOR_TESTING
        /*
-        * in Orion . and .. were stored in the directory (not generated up on
-        * request as now. we preserve them for backward compatibility
+        * In Orion . and .. were stored in the directory (not generated upon
+        * request as now). we preserve them for backward compatibility
         */
        if (name[0] == '.') {
                if (name[1] == 0) {
@@ -654,7 +645,6 @@ static int osd_dir_delete(const struct lu_env *env, struct dt_object *dt,
                        RETURN(0);
                }
        }
-#endif
 
        /* Remove key from the ZAP */
        rc = -zap_remove(osd->od_objset.os, zap_db->db_object,
@@ -841,7 +831,7 @@ static struct dt_key *osd_dir_it_key(const struct lu_env *env,
 
        strcpy(it->ozi_name, za->za_name);
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 3, 91, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 3, 90, 0)
        if (za->za_name[0] == '.') {
                if (za->za_name[1] == 0 || (za->za_name[1] == '.' &&
                    za->za_name[2] == 0)) {
@@ -874,7 +864,7 @@ static int osd_dir_it_key_size(const struct lu_env *env, const struct dt_it *di)
        if ((rc = -zap_cursor_retrieve(it->ozi_zc, za)) == 0)
                rc = strlen(za->za_name);
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 3, 99, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 3, 90, 0)
        if (rc == 0 && za->za_name[0] == '.') {
                if (za->za_name[1] == 0 || (za->za_name[1] == '.' &&
                    za->za_name[2] == 0)) {
@@ -998,14 +988,10 @@ static int osd_dir_it_load(const struct lu_env *env,
        int                rc;
        ENTRY;
 
-       if (it->ozi_pos != 0) {
-               /* the cursor wasn't at the beginning
-                * so we should reset ZAP cursor as well */
-               udmu_zap_cursor_fini(it->ozi_zc);
-               if (udmu_zap_cursor_init(&it->ozi_zc, &osd->od_objset,
-                                        obj->oo_db->db_object, hash))
-                       RETURN(-ENOMEM);
-       }
+       udmu_zap_cursor_fini(it->ozi_zc);
+       if (udmu_zap_cursor_init(&it->ozi_zc, &osd->od_objset,
+                                obj->oo_db->db_object, hash))
+               RETURN(-ENOMEM);
 
        if (hash <= 2) {
                it->ozi_pos = hash;