selftests: ublk: remove unused argument to _cleanup

The _cleanup helper function doesn't take any arguments, so drop them
from its callers.

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Reviewed-by: Ming Lei <tom.leiming@gmail.com>
Link: https://patch.msgid.link/20260421200901.1528842-2-csander@purestorage.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/tools/testing/selftests/ublk/test_batch_01.sh b/tools/testing/selftests/ublk/test_batch_01.sh
index a18fb39af8be7c2c43662e249a96f214ab5551dd..6e19303706a97a5411382c9383934ac7368b8686 100755 (executable)
--- a/tools/testing/selftests/ublk/test_batch_01.sh
+++ b/tools/testing/selftests/ublk/test_batch_01.sh
@@ -18,7 +18,7 @@ dev_id=$(_add_ublk_dev -t loop -q 2 -b "${UBLK_BACKFILES[0]}")
 _check_add_dev $TID $?
 
 if ! _mkfs_mount_test /dev/ublkb"${dev_id}"; then
-       _cleanup_test "generic"
+       _cleanup_test
        _show_result $TID 255
 fi
 
@@ -27,5 +27,5 @@ _check_add_dev $TID $?
 _mkfs_mount_test /dev/ublkb"${dev_id}"
 ERR_CODE=$?
 
-_cleanup_test "generic"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_batch_02.sh b/tools/testing/selftests/ublk/test_batch_02.sh
index 7ca384d1198738854085fac48385ed795c442ccd..7c683f755379b4ccf26452ceea05fac614b44412 100755 (executable)
--- a/tools/testing/selftests/ublk/test_batch_02.sh
+++ b/tools/testing/selftests/ublk/test_batch_02.sh
@@ -25,5 +25,5 @@ fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrit
        --iodepth=32 --size=100M --numjobs=4 > /dev/null 2>&1
 ERR_CODE=$?
 
-_cleanup_test "generic"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_batch_03.sh b/tools/testing/selftests/ublk/test_batch_03.sh
index aca9cf144b553eba8715d8a40a0d63c6dc8311f1..914ccd6a335da2d01f11c8d9cdc00604dfb52b4d 100755 (executable)
--- a/tools/testing/selftests/ublk/test_batch_03.sh
+++ b/tools/testing/selftests/ublk/test_batch_03.sh
@@ -25,5 +25,5 @@ fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrit
        --iodepth=32 --size=100M --numjobs=4 > /dev/null 2>&1
 ERR_CODE=$?
 
-_cleanup_test "generic"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_generic_02.sh b/tools/testing/selftests/ublk/test_generic_02.sh
index 46b657143fd6b5ab5a2289c6348c934c3bdf438a..2afc8cdbed8f01157dc9532328aa57631432c82d 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_02.sh
+++ b/tools/testing/selftests/ublk/test_generic_02.sh
@@ -29,7 +29,7 @@ for _ in $(seq 100); do
 done
 
 if ! kill -0 "$btrace_pid" 2>/dev/null; then
-       _cleanup_test "null"
+       _cleanup_test
        exit "$UBLK_SKIP_CODE"
 fi
 
@@ -51,5 +51,5 @@ if grep -q "^out_of_order:" "$UBLK_TMP"; then
        grep "^out_of_order:" "$UBLK_TMP"
        ERR_CODE=255
 fi
-_cleanup_test "null"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_generic_03.sh b/tools/testing/selftests/ublk/test_generic_03.sh
index 8934ea926762b55c9a8ce366ef5f0192b2e065dc..8e78be860d3443e688b62807f24032bd985613b5 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_03.sh
+++ b/tools/testing/selftests/ublk/test_generic_03.sh
@@ -23,5 +23,5 @@ fi
 if [ "$max_segment_size" != "32768" ]; then
        ERR_CODE=255
 fi
-_cleanup_test "null"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_generic_06.sh b/tools/testing/selftests/ublk/test_generic_06.sh
index 14a05054fcd8b6a32c54689e9d03ad58f554593c..a8b3634b6b4b1a6e62f0681d3e3d6297346dd842 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_06.sh
+++ b/tools/testing/selftests/ublk/test_generic_06.sh
@@ -36,5 +36,5 @@ if [ $ELAPSED -ge 5 ]; then
         ERR_CODE=255
 fi
 
-_cleanup_test "fault_inject"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_generic_07.sh b/tools/testing/selftests/ublk/test_generic_07.sh
index 8dcfd8978f50beb34b4a89ed8dda028eeb7674ed..d2c5e65bd124696e70a839de2ed0d9d849e2b918 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_07.sh
+++ b/tools/testing/selftests/ublk/test_generic_07.sh
@@ -23,5 +23,5 @@ if [ "$ERR_CODE" -eq 0 ]; then
        ERR_CODE=$?
 fi
 
-_cleanup_test "generic"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_generic_08.sh b/tools/testing/selftests/ublk/test_generic_08.sh
index ce88c31d6b9cc52425edf8d1e6124096f3c5269d..77a18b313f3d7c8b48ba61573437d14ff9e96d0e 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_08.sh
+++ b/tools/testing/selftests/ublk/test_generic_08.sh
@@ -18,7 +18,7 @@ dev_id=$(_add_ublk_dev -t loop -q 2 --auto_zc "${UBLK_BACKFILES[0]}")
 _check_add_dev $TID $?
 
 if ! _mkfs_mount_test /dev/ublkb"${dev_id}"; then
-       _cleanup_test "generic"
+       _cleanup_test
        _show_result $TID 255
 fi
 
@@ -27,5 +27,5 @@ _check_add_dev $TID $?
 _mkfs_mount_test /dev/ublkb"${dev_id}"
 ERR_CODE=$?
 
-_cleanup_test "generic"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_generic_09.sh b/tools/testing/selftests/ublk/test_generic_09.sh
index 744d0cdaa2426c036d1bc70b9e83350da9400c30..6c25242f245f9b8e673cfc6871664f77220831d1 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_09.sh
+++ b/tools/testing/selftests/ublk/test_generic_09.sh
@@ -22,6 +22,6 @@ _check_add_dev $TID $?
 fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrite --iodepth=32 --size=256M > /dev/null 2>&1
 ERR_CODE=$?
 
-_cleanup_test "null"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_generic_10.sh b/tools/testing/selftests/ublk/test_generic_10.sh
index 4b4293b9081f8fa9fb6fd23a18ba86941f391959..fdabc9d9075e9698d5f1e1c6ba6dd99fe6f2d912 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_10.sh
+++ b/tools/testing/selftests/ublk/test_generic_10.sh
@@ -25,5 +25,5 @@ if [ "$new_size" != "$size" ]; then
        ERR_CODE=255
 fi
 
-_cleanup_test "null"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_generic_12.sh b/tools/testing/selftests/ublk/test_generic_12.sh
index 54b81ddfe9f91a17579e533919d1d8307f3b69d4..435497f8da8dcd9feea312854a080b33a433e1d4 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_12.sh
+++ b/tools/testing/selftests/ublk/test_generic_12.sh
@@ -25,7 +25,7 @@ btrace_pid=$!
 sleep 2
 
 if ! kill -0 "$btrace_pid" > /dev/null 2>&1; then
-       _cleanup_test "null"
+       _cleanup_test
        exit "$UBLK_SKIP_CODE"
 fi
 
@@ -54,5 +54,5 @@ if [[ $NR_THREADS_THAT_HANDLED_IO -ne $NTHREADS ]]; then
         ERR_CODE=255
 fi
 
-_cleanup_test "null"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_generic_13.sh b/tools/testing/selftests/ublk/test_generic_13.sh
index 922115aa14f41922e47cd029c273f26ef4762e19..2c1be6286db8990332e9a789a197d34699a2fba8 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_13.sh
+++ b/tools/testing/selftests/ublk/test_generic_13.sh
@@ -15,5 +15,5 @@ if ${UBLK_PROG} features | grep -q unknown; then
         ERR_CODE=255
 fi
 
-_cleanup_test "null"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_generic_16.sh b/tools/testing/selftests/ublk/test_generic_16.sh
index 3ef367836ac5a73c5ea8d71757f14336f720e56c..6a4952146ea1a2adc7fa4765371f8c17b64b0d9a 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_16.sh
+++ b/tools/testing/selftests/ublk/test_generic_16.sh
@@ -9,7 +9,7 @@ _prep_test "null" "stop --safe command"
 
 # Check if SAFE_STOP_DEV feature is supported
 if ! _have_feature "SAFE_STOP_DEV"; then
-       _cleanup_test "null"
+       _cleanup_test
        exit "$UBLK_SKIP_CODE"
 fi
 
@@ -52,5 +52,5 @@ wait $dd_pid 2>/dev/null
 _ublk_del_dev "${dev_id}"
 udevadm settle
 
-_cleanup_test "null"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_generic_17.sh b/tools/testing/selftests/ublk/test_generic_17.sh
index 2278b5fc9dba523bb1bf8411d22f4f95a28da905..b483d53a897a7b126c5430c8ec1c841ec6603552 100755 (executable)
--- a/tools/testing/selftests/ublk/test_generic_17.sh
+++ b/tools/testing/selftests/ublk/test_generic_17.sh
@@ -31,5 +31,5 @@ fi
 # time out here
 _ublk_del_dev "${dev_id}"
 
-_cleanup_test "fault_inject"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_loop_01.sh b/tools/testing/selftests/ublk/test_loop_01.sh
index 338a235fd82a4c1322b498584114780ad778f3ff..c0f5b619ad6e9337fde90a21b627d86b9deab4ab 100755 (executable)
--- a/tools/testing/selftests/ublk/test_loop_01.sh
+++ b/tools/testing/selftests/ublk/test_loop_01.sh
@@ -20,6 +20,6 @@ _check_add_dev $TID $?
 _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=256M
 ERR_CODE=$?
 
-_cleanup_test "loop"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_loop_02.sh b/tools/testing/selftests/ublk/test_loop_02.sh
index 04c52454e2eca06f91c75a5e8656348581b36557..f4191ea71f50872be85fb5dbea9438a7f91951e8 100755 (executable)
--- a/tools/testing/selftests/ublk/test_loop_02.sh
+++ b/tools/testing/selftests/ublk/test_loop_02.sh
@@ -14,6 +14,6 @@ _check_add_dev $TID $?
 _mkfs_mount_test /dev/ublkb"${dev_id}"
 ERR_CODE=$?
 
-_cleanup_test "loop"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_loop_03.sh b/tools/testing/selftests/ublk/test_loop_03.sh
index 6e8f649fe93dcb2adafcb22fc3f25f69f299ae23..aaac0c59a5adc863805492d0d7584f97ef980e56 100755 (executable)
--- a/tools/testing/selftests/ublk/test_loop_03.sh
+++ b/tools/testing/selftests/ublk/test_loop_03.sh
@@ -19,6 +19,6 @@ _check_add_dev $TID $?
 _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=256M
 ERR_CODE=$?
 
-_cleanup_test "loop"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_loop_04.sh b/tools/testing/selftests/ublk/test_loop_04.sh
index 9f6774ec0de65a0d36da2b8ee6d64fe098fe9647..f584c119f1d2911c033b64d52da2650d89000da2 100755 (executable)
--- a/tools/testing/selftests/ublk/test_loop_04.sh
+++ b/tools/testing/selftests/ublk/test_loop_04.sh
@@ -15,6 +15,6 @@ _check_add_dev $TID $?
 _mkfs_mount_test /dev/ublkb"${dev_id}"
 ERR_CODE=$?
 
-_cleanup_test "loop"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_loop_05.sh b/tools/testing/selftests/ublk/test_loop_05.sh
index 2b8d99e007be781d789aaaf33f29921cce79c2ca..ca1a5df5f9de2c06ef688b9a3f6f816c01357c58 100755 (executable)
--- a/tools/testing/selftests/ublk/test_loop_05.sh
+++ b/tools/testing/selftests/ublk/test_loop_05.sh
@@ -20,6 +20,6 @@ _check_add_dev $TID $?
 _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=256M
 ERR_CODE=$?
 
-_cleanup_test "loop"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_loop_06.sh b/tools/testing/selftests/ublk/test_loop_06.sh
index e73f6f4844db7278aa12e93f2f85b0a04d7da42e..26f710ba9db7ba3674b73db67047981ee7ce4e1a 100755 (executable)
--- a/tools/testing/selftests/ublk/test_loop_06.sh
+++ b/tools/testing/selftests/ublk/test_loop_06.sh
@@ -19,6 +19,6 @@ _check_add_dev $TID $?
 _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=256M
 ERR_CODE=$?
 
-_cleanup_test "loop"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_loop_07.sh b/tools/testing/selftests/ublk/test_loop_07.sh
index 264d20e7c530a5536884762fcd7a5ad467f86dd6..a9ab0b671cb23dd5fa4a1222676809a236233d45 100755 (executable)
--- a/tools/testing/selftests/ublk/test_loop_07.sh
+++ b/tools/testing/selftests/ublk/test_loop_07.sh
@@ -15,6 +15,6 @@ _check_add_dev $TID $?
 _mkfs_mount_test /dev/ublkb"${dev_id}"
 ERR_CODE=$?
 
-_cleanup_test "loop"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_null_01.sh b/tools/testing/selftests/ublk/test_null_01.sh
index eebce8076530ec34791beab4fbe59ded2fa2c345..d2c38cbb2dd5dcae9cdf6c46039cc333608ffb21 100755 (executable)
--- a/tools/testing/selftests/ublk/test_null_01.sh
+++ b/tools/testing/selftests/ublk/test_null_01.sh
@@ -18,6 +18,6 @@ _check_add_dev $TID $?
 fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrite --iodepth=32 --size=256M > /dev/null 2>&1
 ERR_CODE=$?
 
-_cleanup_test "null"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_null_02.sh b/tools/testing/selftests/ublk/test_null_02.sh
index 654bdff3966423f1b91775a4a11d38be93833cd2..7b205ca56367d2fabb39bbeb133b7c43565cd9da 100755 (executable)
--- a/tools/testing/selftests/ublk/test_null_02.sh
+++ b/tools/testing/selftests/ublk/test_null_02.sh
@@ -18,6 +18,6 @@ _check_add_dev $TID $?
 fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrite --iodepth=32 --size=256M > /dev/null 2>&1
 ERR_CODE=$?
 
-_cleanup_test "null"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_null_03.sh b/tools/testing/selftests/ublk/test_null_03.sh
index 29cd09f06672defec19b059932dbd54b629c0398..eee7a87a60dadf0b6d71c86134304a2849269d0f 100755 (executable)
--- a/tools/testing/selftests/ublk/test_null_03.sh
+++ b/tools/testing/selftests/ublk/test_null_03.sh
@@ -18,6 +18,6 @@ _check_add_dev $TID $?
 fio --name=job1 --filename=/dev/ublkb"${dev_id}" --ioengine=libaio --rw=readwrite --iodepth=32 --size=256M > /dev/null 2>&1
 ERR_CODE=$?
 
-_cleanup_test "null"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_part_01.sh b/tools/testing/selftests/ublk/test_part_01.sh
index 8028f6e4b3a5e459947dde4d11e885024f023697..fa3b1a9af89439ea235438d295877a8c6eee8e89 100755 (executable)
--- a/tools/testing/selftests/ublk/test_part_01.sh
+++ b/tools/testing/selftests/ublk/test_part_01.sh
@@ -82,7 +82,7 @@ fi
 _prep_test "generic" "test UBLK_F_NO_AUTO_PART_SCAN"
 
 if ! _have_feature "UBLK_F_NO_AUTO_PART_SCAN"; then
-       _cleanup_test "generic"
+       _cleanup_test
        exit "$UBLK_SKIP_CODE"
 fi
 
@@ -100,5 +100,5 @@ format_backing_file "${UBLK_BACKFILES[0]}"
 [ "$ERR_CODE" -eq 0 ] && test_no_auto_part_scan "${UBLK_BACKFILES[0]}"
 [ $? -ne 0 ] && ERR_CODE=255
 
-_cleanup_test "generic"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_part_02.sh b/tools/testing/selftests/ublk/test_part_02.sh
index 7d42ab4d6e838393e4e190f887e78499bc83accb..d9ec06f36aee8de99d5812da339740cee9fd46fd 100755 (executable)
--- a/tools/testing/selftests/ublk/test_part_02.sh
+++ b/tools/testing/selftests/ublk/test_part_02.sh
@@ -63,5 +63,5 @@ _test_partition_scan_no_hang "no" "DEAD"
 # Test 2: With recovery support - should transition to QUIESCED
 _test_partition_scan_no_hang "yes" "QUIESCED"
 
-_cleanup_test "partition_scan"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_recover_01.sh b/tools/testing/selftests/ublk/test_recover_01.sh
index 2672f9c40fa8ba58557dd263870485fd6a292e42..1cddc2345dab7db1c9b149bfc71d7bea6f61ee33 100755 (executable)
--- a/tools/testing/selftests/ublk/test_recover_01.sh
+++ b/tools/testing/selftests/ublk/test_recover_01.sh
@@ -40,5 +40,5 @@ ublk_run_recover_test -t loop -q 2 -r 1 -i 1 "${UBLK_BACKFILES[0]}" &
 ublk_run_recover_test -t stripe -q 2 -r 1 -i 1 "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" &
 wait
 
-_cleanup_test "recover"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_recover_02.sh b/tools/testing/selftests/ublk/test_recover_02.sh
index bda5064bc31f8635f0591d1bcc41e2d458d5d9f6..9c3f481880d32b2172f3f856548a336632593760 100755 (executable)
--- a/tools/testing/selftests/ublk/test_recover_02.sh
+++ b/tools/testing/selftests/ublk/test_recover_02.sh
@@ -44,5 +44,5 @@ ublk_run_recover_test -t loop -q 2 -r 1 -z -i 1 "${UBLK_BACKFILES[0]}" &
 ublk_run_recover_test -t stripe -q 2 -r 1 -z -i 1 "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" &
 wait
 
-_cleanup_test "recover"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_recover_03.sh b/tools/testing/selftests/ublk/test_recover_03.sh
index e0dc0b8fe5d66eb51b325d11ccb342be581bd8a5..2554805e5b02c5953083d9526aa9f315b519cb17 100755 (executable)
--- a/tools/testing/selftests/ublk/test_recover_03.sh
+++ b/tools/testing/selftests/ublk/test_recover_03.sh
@@ -39,5 +39,5 @@ ublk_run_quiesce_recover -t loop -q 2 -r 1 -i 1 "${UBLK_BACKFILES[0]}" &
 ublk_run_quiesce_recover -t stripe -q 2 -r 1 -i 1 "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" &
 wait
 
-_cleanup_test "quiesce"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_recover_04.sh b/tools/testing/selftests/ublk/test_recover_04.sh
index 178443394ca51903b94c047c132d21a803c4055a..4c83c1840c683b971d5901dd8d71360a4247926d 100755 (executable)
--- a/tools/testing/selftests/ublk/test_recover_04.sh
+++ b/tools/testing/selftests/ublk/test_recover_04.sh
@@ -35,5 +35,5 @@ ublk_run_recover_test -t loop -q 2 -r 1 -u -i 1 "${UBLK_BACKFILES[0]}" &
 ublk_run_recover_test -t stripe -q 2 -r 1 -u -i 1 "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" &
 wait
 
-_cleanup_test "recover"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_shmemzc_01.sh b/tools/testing/selftests/ublk/test_shmemzc_01.sh
index 47210af2aa206b78defeeb170429fcf58d554e48..b244ab3479a267a10d053e1d790e276eacab646f 100755 (executable)
--- a/tools/testing/selftests/ublk/test_shmemzc_01.sh
+++ b/tools/testing/selftests/ublk/test_shmemzc_01.sh
@@ -67,6 +67,6 @@ umount "$HTLB_MNT"
 rmdir "$HTLB_MNT"
 echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages
 
-_cleanup_test "shmem_zc"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_shmemzc_02.sh b/tools/testing/selftests/ublk/test_shmemzc_02.sh
index aed9262494e9fb88a11ed953ec76356118aeae30..810dccba6d84ac19c37db0a4ba3042d46aa82f0e 100755 (executable)
--- a/tools/testing/selftests/ublk/test_shmemzc_02.sh
+++ b/tools/testing/selftests/ublk/test_shmemzc_02.sh
@@ -63,6 +63,6 @@ umount "$HTLB_MNT"
 rmdir "$HTLB_MNT"
 echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages
 
-_cleanup_test "shmem_zc"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_shmemzc_03.sh b/tools/testing/selftests/ublk/test_shmemzc_03.sh
index db967a9ffe81c4e1ea6d14e10a5541e851888586..606362491a320780424cc2c49094ddd1be232a7a 100755 (executable)
--- a/tools/testing/selftests/ublk/test_shmemzc_03.sh
+++ b/tools/testing/selftests/ublk/test_shmemzc_03.sh
@@ -64,6 +64,6 @@ umount "$HTLB_MNT"
 rmdir "$HTLB_MNT"
 echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages
 
-_cleanup_test "shmem_zc"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_shmemzc_04.sh b/tools/testing/selftests/ublk/test_shmemzc_04.sh
index 899de088ece4ce87aa4e6b181576b0b80270f1a8..9a2a6c2e8abe8a7c2760ed9e446a8a5372ecafa9 100755 (executable)
--- a/tools/testing/selftests/ublk/test_shmemzc_04.sh
+++ b/tools/testing/selftests/ublk/test_shmemzc_04.sh
@@ -67,6 +67,6 @@ umount "$HTLB_MNT"
 rmdir "$HTLB_MNT"
 echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages
 
-_cleanup_test "shmem_zc"
+_cleanup_test
 
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stress_01.sh b/tools/testing/selftests/ublk/test_stress_01.sh
index a9322ce496e9e6d8ebcc18389213d21a9fa201cf..f91783f27649d5eb3069a62aaa8562d5e6b4774c 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stress_01.sh
+++ b/tools/testing/selftests/ublk/test_stress_01.sh
@@ -29,5 +29,5 @@ ublk_io_and_remove 256M -t loop -q 4 "${UBLK_BACKFILES[0]}" &
 ublk_io_and_remove 256M -t stripe -q 4 "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" &
 wait
 
-_cleanup_test "stress"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stress_02.sh b/tools/testing/selftests/ublk/test_stress_02.sh
index 6c114194f9c9d4aa164ad04559221a6cace23e23..b128d11658a8694d34c3994bdd9875669008145a 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stress_02.sh
+++ b/tools/testing/selftests/ublk/test_stress_02.sh
@@ -31,5 +31,5 @@ for nr_queue in 1 4; do
        wait
 done
 
-_cleanup_test "stress"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stress_03.sh b/tools/testing/selftests/ublk/test_stress_03.sh
index 4e81ca0db7582e64a47696addb34f1c4d8dea726..a0f0aba8eebcefa76dc087ee132268f1b568aa64 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stress_03.sh
+++ b/tools/testing/selftests/ublk/test_stress_03.sh
@@ -49,5 +49,5 @@ if _have_feature "PER_IO_DAEMON"; then
        wait
 fi
 
-_cleanup_test "stress"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stress_04.sh b/tools/testing/selftests/ublk/test_stress_04.sh
index 6c6f44b172bcbb6bd853df7ea73e0e63a49d85bf..896eae68d4445a57908df70bfd6b248dd616d7de 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stress_04.sh
+++ b/tools/testing/selftests/ublk/test_stress_04.sh
@@ -48,5 +48,5 @@ if _have_feature "PER_IO_DAEMON"; then
        wait
 fi
 
-_cleanup_test "stress"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stress_05.sh b/tools/testing/selftests/ublk/test_stress_05.sh
index 7e9324de2030544726dbe63167f8980fc9495a85..d6c00c72080db55827f5547c8dc66d108ecfeb41 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stress_05.sh
+++ b/tools/testing/selftests/ublk/test_stress_05.sh
@@ -79,5 +79,5 @@ if _have_feature "PER_IO_DAEMON"; then
 fi
 wait
 
-_cleanup_test "stress"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stress_06.sh b/tools/testing/selftests/ublk/test_stress_06.sh
index c72e5d0b14be998c2cb7bc6c15d7e8702a9a774a..9481a273a4b43c99e20ef230d50d7db171981382 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stress_06.sh
+++ b/tools/testing/selftests/ublk/test_stress_06.sh
@@ -34,5 +34,5 @@ ublk_io_and_remove 256M -t loop -q 4 -u --nthreads 8 --per_io_tasks "${UBLK_BACK
 ublk_io_and_remove 256M -t stripe -q 4 -u --nthreads 8 --per_io_tasks "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" &
 wait
 
-_cleanup_test "stress"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stress_07.sh b/tools/testing/selftests/ublk/test_stress_07.sh
index 04c2764d5238a6a84b2a4be56972b7d346a12b5a..3e01c037cffbb6c6de8ff266d7295c40a50dc9a6 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stress_07.sh
+++ b/tools/testing/selftests/ublk/test_stress_07.sh
@@ -34,5 +34,5 @@ ublk_io_and_kill_daemon 256M -t loop -q 4 -u --nthreads 8 --per_io_tasks "${UBLK
 ublk_io_and_kill_daemon 256M -t stripe -q 4 -u --nthreads 8 --per_io_tasks "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" &
 wait
 
-_cleanup_test "stress"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stress_08.sh b/tools/testing/selftests/ublk/test_stress_08.sh
index 37f7d204879a715e7cd8c2e63fda388d67d2433c..5f32424d289251456c670d2cee74ec6a17ca954e 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stress_08.sh
+++ b/tools/testing/selftests/ublk/test_stress_08.sh
@@ -40,5 +40,5 @@ ublk_io_and_remove 256M -t stripe -q 4 --auto_zc -b "${UBLK_BACKFILES[1]}" "${UB
 ublk_io_and_remove 8G -t null -q 4 -z --auto_zc --auto_zc_fallback -b &
 wait
 
-_cleanup_test "stress"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stress_09.sh b/tools/testing/selftests/ublk/test_stress_09.sh
index 53c1e3b2ab303291c8c47c17b8a43077dde1b519..64cb8d9b043821ccab6466e559ea435f730230c0 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stress_09.sh
+++ b/tools/testing/selftests/ublk/test_stress_09.sh
@@ -39,5 +39,5 @@ ublk_io_and_kill_daemon 256M -t stripe -q 4 -b "${UBLK_BACKFILES[1]}" "${UBLK_BA
 ublk_io_and_kill_daemon 8G -t null -q 4 -z --auto_zc --auto_zc_fallback -b &
 wait
 
-_cleanup_test "stress"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stripe_01.sh b/tools/testing/selftests/ublk/test_stripe_01.sh
index 3bc821aadad8922bc8e84726f453d3686364926e..9ffce477b461a7cf70da31197c3db6d4a9f8a7a4 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stripe_01.sh
+++ b/tools/testing/selftests/ublk/test_stripe_01.sh
@@ -21,5 +21,5 @@ _check_add_dev $TID $?
 _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=512M
 ERR_CODE=$?
 
-_cleanup_test "stripe"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stripe_02.sh b/tools/testing/selftests/ublk/test_stripe_02.sh
index 4a7d2b21a6bf9d8bd0bced96b7b2a0a9866eb44a..4c172950a2474b8228277bb955e2a51d25f9525e 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stripe_02.sh
+++ b/tools/testing/selftests/ublk/test_stripe_02.sh
@@ -16,5 +16,5 @@ _check_add_dev $TID $?
 _mkfs_mount_test /dev/ublkb"${dev_id}"
 ERR_CODE=$?
 
-_cleanup_test "stripe"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stripe_03.sh b/tools/testing/selftests/ublk/test_stripe_03.sh
index a1c159d54e5323162ad44c6cb3ac2bbfb545e822..2cdf9f9589882c6d49615736f5905ad46f8ba28c 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stripe_03.sh
+++ b/tools/testing/selftests/ublk/test_stripe_03.sh
@@ -21,5 +21,5 @@ _check_add_dev $TID $?
 _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=512M
 ERR_CODE=$?
 
-_cleanup_test "stripe"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stripe_04.sh b/tools/testing/selftests/ublk/test_stripe_04.sh
index 0c30bd6c2b3bf55bfbe37474aa2eea199b171518..e24120eaca0e36d3c9589063af809467f326fb08 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stripe_04.sh
+++ b/tools/testing/selftests/ublk/test_stripe_04.sh
@@ -16,5 +16,5 @@ _check_add_dev $TID $?
 _mkfs_mount_test /dev/ublkb"${dev_id}"
 ERR_CODE=$?
 
-_cleanup_test "stripe"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stripe_05.sh b/tools/testing/selftests/ublk/test_stripe_05.sh
index 6ddfa88ad226253403d66f084f2e31273d03b1c4..f3de2d5cdfe478a2941dbd9030655e75fd763a1c 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stripe_05.sh
+++ b/tools/testing/selftests/ublk/test_stripe_05.sh
@@ -21,5 +21,5 @@ _check_add_dev $TID $?
 _run_fio_verify_io --filename=/dev/ublkb"${dev_id}" --size=512M
 ERR_CODE=$?
 
-_cleanup_test "stripe"
+_cleanup_test
 _show_result $TID $ERR_CODE

diff --git a/tools/testing/selftests/ublk/test_stripe_06.sh b/tools/testing/selftests/ublk/test_stripe_06.sh
index a2c7bf4cc613b46d1d537d6db4a23b6ff130ab3b..3fd5cd90295661566ed4ffd756d945efa0177191 100755 (executable)
--- a/tools/testing/selftests/ublk/test_stripe_06.sh
+++ b/tools/testing/selftests/ublk/test_stripe_06.sh
@@ -16,5 +16,5 @@ _check_add_dev $TID $?
 _mkfs_mount_test /dev/ublkb"${dev_id}"
 ERR_CODE=$?
 
-_cleanup_test "stripe"
+_cleanup_test
 _show_result $TID $ERR_CODE