Merge pull request linux-blktests#171 from bvanassche/master

Multiple minor improvements for common scripts

Author: kawasaki

common/fio

@@ -177,6 +177,7 @@ _run_fio() {
 		args+=("--runtime=$TIMEOUT")
 	fi
 
+	echo "fio ${args[*]} $*" >>"$FULL"
 	fio "${args[@]}" "$@"
 	local rc=$?
 	if [ $rc != 0 ]; then
@@ -219,20 +220,23 @@ _run_fio_verify_io() {
 }
 
 _fio_perf_report() {
-	# If there is more than one group, we don't know what to report.
-	if [[ $(wc -l < "$TMPDIR/fio_perf") -gt 1 ]]; then
-		echo "_fio_perf: too many terse lines" >&2
-		return
-	fi
+	local name field value_array
+	{
+		IFS=';' read -ra value_array
+
+		# If there is more than one group, we don't know what to report.
+		if read -r; then
+			echo "_fio_perf: too many terse lines" >&2
+			return
+		fi
+	} <"$TMPDIR/fio_perf"
 
-	local name field value
 	for name in "${FIO_PERF_FIELDS[@]}"; do
 		field="${FIO_TERSE_FIELDS["$name"]}"
 		if [[ -z $field ]]; then
 			echo "_fio_perf: unknown fio terse field '$name'" >&2
 			continue
 		fi
-		value="$(cut -d ';' -f "$field" "$TMPDIR/fio_perf")"
-		TEST_RUN["$FIO_PERF_PREFIX$name"]="$value"
+		TEST_RUN["$FIO_PERF_PREFIX$name"]=${value_array[$((field - 1))]}
 	done
 }

common/null_blk

@@ -49,24 +49,29 @@ _init_null_blk() {
 
 # Configure one null_blk instance with name $1 and parameters $2..${$#}.
 _configure_null_blk() {
-	local nullb=/sys/kernel/config/nullb/$1 param val
+	local nullb_path=/sys/kernel/config/nullb/$1 params param
 	shift
 
 	if [[ ! -d /sys/module/null_blk ]]; then
 		modprobe -q null_blk
 	fi
 
-	mkdir "$nullb" || return $?
+	mkdir "$nullb_path" || return $?
 
+	params=()
 	if (( RUN_FOR_ZONED )); then
-		echo "1" > "$nullb/zoned" || return 1
+		params+=(zoned=1)
 	fi
+	params+=("$@")
 
-	while [[ $# -gt 0 ]]; do
-		param="${1%%=*}"
-		val="${1#*=}"
-		shift
-		echo "$val" > "$nullb/$param" || return 1
+	echo "$nullb_path ${params[*]}" >>"${FULL}"
+
+	for param in "${params[@]}"; do
+		local key="${param%%=*}" val="${param#*=}"
+		if ! echo "$val" > "$nullb_path/$key"; then
+			echo "Writing $val into $nullb_path/$key failed"
+			return 1
+		fi
 	done
 }
 

common/rc

@@ -37,14 +37,13 @@ _module_file_exists()
 	local ko_underscore=${1//-/_}.ko
 	local ko_hyphen=${1//_/-}.ko
 	local libpath
-	local -i count
 
 	libpath="/lib/modules/$(uname -r)/kernel"
 	[[ ! -d $libpath ]] && return 1
-	count=$(find "$libpath" -name "$ko_underscore*" -o \
-		     -name "$ko_hyphen*" | wc -l)
-	((count)) && return 0
-	return 1
+	local module_path
+	module_path="$(find "$libpath" -name "$ko_underscore*" -o \
+			-name "$ko_hyphen*")"
+	[ -n "${module_path}" ]
 }
 
 # Check that the specified module or driver is available, regardless of whether