Revert "LU-3573 osd-zfs: Only advance zap cursor as needed"

This reverts commit 1da9b84b39ab36be9ba67a72ae175dde6521769b.

This patch introduced a far more serious regression in conf-sanity
test_32b LU-5924 and should be reverted until the problem is fixed.

Change-Id: I28f04a33d1c1bb4688d2ba9af6015a2737fb1d93
Reviewed-on: http://review.whamcloud.com/12887
Tested-by: Jenkins
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/osd-zfs/osd_index.c b/lustre/osd-zfs/osd_index.c
index efd2117..dbc8f30 100644 (file)
--- a/lustre/osd-zfs/osd_index.c
+++ b/lustre/osd-zfs/osd_index.c
@@ -865,8 +865,6 @@ static int osd_dir_it_next(const struct lu_env *env, struct dt_it *di)
        zap_attribute_t   *za = &osd_oti_get(env)->oti_za;
        int                rc;
 
        zap_attribute_t   *za = &osd_oti_get(env)->oti_za;
        int                rc;
 

-       ENTRY;
-

        /* temp. storage should be enough for any key supported by ZFS */
        CLASSERT(sizeof(za->za_name) <= sizeof(it->ozi_name));
 
        /* temp. storage should be enough for any key supported by ZFS */
        CLASSERT(sizeof(za->za_name) <= sizeof(it->ozi_name));
 


@@ -879,11 +877,10 @@ static int osd_dir_it_next(const struct lu_env *env, struct dt_it *di)
                it->ozi_pos++;
                if (it->ozi_pos <=2)
                        RETURN(0);
                it->ozi_pos++;
                if (it->ozi_pos <=2)
                        RETURN(0);

-
-       } else {
-               zap_cursor_advance(it->ozi_zc);

        }
 
        }
 

+       zap_cursor_advance(it->ozi_zc);
+

        /*
         * According to current API we need to return error if its last entry.
         * zap_cursor_advance() does not return any value. So we need to call
        /*
         * According to current API we need to return error if its last entry.
         * zap_cursor_advance() does not return any value. So we need to call