From 74acc4e5f75e4dd69ca94de8ddfabde23941ba88 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Sat, 30 Mar 2013 17:34:06 -0500
Subject: [PATCH] Rename prepare_scratch to clean_scratch

---
 bench       | 8 ++++----
 tests/mdmfs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bench b/bench
index b31505b..fdc4ac4 100755
--- a/bench
+++ b/bench
@@ -19,11 +19,12 @@ run_log="${logs}/bench-$(date +%Y-%m-%d_%H:%M:%S).log"
 
 # Scratch directory maintenance
 scratch="/bonnie"
-prepare_scratch() {
+clean_scratch() {
   [ -d "${scratch}" ] || mkdir -p "${scratch}"
   mount | grep -q ' on '"${scratch}"' ' && umount "${scratch}" || true
   find "${scratch}" -uid "${bonnie_uid}" -xdev -delete
 }
+clean_scratch
 
 # Bonnie setup
 bonnie_uid="4444"
@@ -36,13 +37,13 @@ run_bonnie() {
 
 # Default methods
 setup() {
-  prepare_scratch
+  clean_scratch
 }
 run() {
   run_bonnie
 }
 teardown() {
-  prepare_scratch
+  clean_scratch
 }
 
 # Main event
@@ -54,7 +55,6 @@ else
   test="${1}"; shift
   testfile="${tests}/${test}"
   [ -f "${testfile}" ] || wtf "Test '${test}' does not exist"
-  prepare_scratch
   ( log "Preparing test: ${test}"
     . "${testfile}"
     setup
diff --git a/tests/mdmfs b/tests/mdmfs
index d01e129..1f46bab 100644
--- a/tests/mdmfs
+++ b/tests/mdmfs
@@ -6,5 +6,5 @@ teardown() {
   md="$(mount | grep ' on '"${scratch}"' ' | cut -d' ' -f1)"
   umount "${scratch}"
   mdconfig -d -u "${md}"
-  prepare_scratch
+  clean_scratch
 }
-- 
2.42.0