common/populate: decrease the step of rm file

[xfstests-dev.git] / common / populate

diff --git a/common/populate b/common/populate
index 1f921ac57b4cd968dd7c65cffc861abb6b24e019..7403dec337e9acffa08e5c7684644ed1cb7c26a2 100644 (file)
--- a/common/populate
+++ b/common/populate
@@ -271,7 +271,7 @@ _scratch_xfs_populate() {
                touch "${dir}/${f}"
        done
 
-       seq 0 "$((ino_per_rec + 1))" "${nr}" | while read f; do
+       seq 0 2 "${nr}" | while read f; do
                rm -f "${dir}/${f}"
        done
 
@@ -805,10 +805,12 @@ _scratch_populate_restore_cached() {
 # Populate a scratch FS from scratch or from a cached image.
 _scratch_populate_cached() {
        local meta_descr="$(_scratch_populate_cache_tag "$@")"
+       local meta_tag="$(echo "${meta_descr}" | md5sum - | cut -d ' ' -f 1)"
+       local metadump_stem="${TEST_DIR}/__populate.${FSTYP}.${meta_tag}"
 
        # These variables are shared outside this function
-       POPULATE_METADUMP="${TEST_DIR}/__populate.${FSTYP}"
-       POPULATE_METADUMP_DESCR="${TEST_DIR}/__populate.${FSTYP}.txt"
+       POPULATE_METADUMP="${metadump_stem}.metadump"
+       POPULATE_METADUMP_DESCR="${metadump_stem}.txt"
 
        # Don't keep metadata images cached for more 48 hours...
        rm -rf "$(find "${POPULATE_METADUMP}" -mtime +2 2>/dev/null)"