Hello Frank, thank you for finding the issue and fixing it.
I have three comments on the patch:
- I think the io_uring_disabled proc file was introduced with the kernel version
6.6. To care the kernels older than that, I suggest to check if the proc file
exists or not before touching it.
- A few ShellCheck warnings to be addressed (SC2155, SC2086).
- Tab indent is preferred to space indent.
IOW, I suggest the change below on top of your patch. May I amend your path
with this change? Or if you like, you can send v2. Please let me know your
preference.
liff --git a/tests/block/035 b/tests/block/035
index f602e9a..8fcc9c6 100755
--- a/tests/block/035
+++ b/tests/block/035
@@ -56,9 +56,12 @@ test() {
return 1
fi
# enable io_uring when it is disabled
- local io_uring_disabled=$(cat /proc/sys/kernel/io_uring_disabled)
- if [ $io_uring_disabled != 0 ]; then
- echo 0 > /proc/sys/kernel/io_uring_disabled
+ local io_uring_disabled=0
+ if [ -f /proc/sys/kernel/io_uring_disabled ]; then
+ io_uring_disabled=$(cat /proc/sys/kernel/io_uring_disabled)
+ if [ "$io_uring_disabled" != 0 ]; then
+ echo 0 > /proc/sys/kernel/io_uring_disabled
+ fi
fi
local fio_output=${RESULTS_DIR}/block/fio-output-block-035.txt
fio --rw=randwrite --ioengine=io_uring --iodepth=64 \
@@ -72,8 +75,8 @@ test() {
rmdir /sys/kernel/config/nullb/nullb*
_exit_null_blk
# reset io_uring setting before exits test
- if [ $io_uring_disabled != 0 ]; then
- echo $io_uring_disabled > /proc/sys/kernel/io_uring_disabled
+ if [ "$io_uring_disabled" != 0 ]; then
+ echo "$io_uring_disabled" > /proc/sys/kernel/io_uring_disabled
fi
if [ $fio_status != 0 ]; then
echo "Failed (fio status = $fio_status)"
