All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Wagner <dwagner@suse.de>
To: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Cc: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
	Chaitanya Kulkarni <chaitanyak@nvidia.com>,
	Hannes Reinecke <hare@suse.de>, Daniel Wagner <dwagner@suse.de>
Subject: [PATCH blktests v3 04/20] common/xfs: propagate errors from _xfs_run_fio_verify_io
Date: Tue, 26 Mar 2024 14:13:46 +0100	[thread overview]
Message-ID: <20240326131402.5092-5-dwagner@suse.de> (raw)
In-Reply-To: <20240326131402.5092-1-dwagner@suse.de>

If _xfs_mkfs_and_mount fails _xfs_run_fio_verify_io will continue to
execute and fio will run against the local file system instead against
the block device.

Propagate all errors back to the caller.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
 common/xfs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/xfs b/common/xfs
index 37ce85878df2..569770fecd53 100644
--- a/common/xfs
+++ b/common/xfs
@@ -16,7 +16,7 @@ _xfs_mkfs_and_mount() {
 
 	mkdir -p "${mount_dir}"
 	umount "${mount_dir}"
-	mkfs.xfs -l size=64m -f "${bdev}"
+	mkfs.xfs -l size=64m -f "${bdev}" || return $?
 	mount "${bdev}" "${mount_dir}"
 }
 
@@ -27,8 +27,10 @@ _xfs_run_fio_verify_io() {
 	local sz_mb
 	local avail
 	local avail_mb
+	local rc
 
-	_xfs_mkfs_and_mount "${bdev}" "${mount_dir}" >> "${FULL}" 2>&1
+	_xfs_mkfs_and_mount "${bdev}" "${mount_dir}" \
+		>>"${FULL}" 2>&1 || return $?
 
 	avail="$(df --output=avail "${mount_dir}" | tail -1)"
 	avail_mb="$((avail / 1024))"
@@ -43,7 +45,10 @@ _xfs_run_fio_verify_io() {
 	fi
 
 	_run_fio_verify_io --size="${sz_mb}m" --directory="${mount_dir}/"
+	rc=$?
 
 	umount "${mount_dir}" >> "${FULL}" 2>&1
 	rm -fr "${mount_dir}"
+
+	return "${rc}"
 }
-- 
2.44.0


  parent reply	other threads:[~2024-03-26 13:14 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-26 13:13 [PATCH blktests v3 00/20] refactoring and various cleanups/fixes Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 01/20] nvme/rc: silence error on module unload for fc Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 02/20] nvme/rc: silence fcloop cleanup failures Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 03/20] nvme/rc: log error if stale configuration is found Daniel Wagner
2024-03-26 13:13 ` Daniel Wagner [this message]
2024-03-26 13:13 ` [PATCH blktests v3 05/20] nvme/{012,013,035}: check return value of _xfs_run_fio_verify_io Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 06/20] nvme/rc: use long command line option for nvme Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 07/20] nvme/{014,015,018,019,020,023,024,026,045,046}: " Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 08/20] nvme/rc: connect subsys only support long options Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 09/20] nvme/rc: add nqn/uuid args to target setup/cleanup helper Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 10/20] nvme/rc: remove unused connect options Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 11/20] nvme/rc: do not cleanup external managed loop device Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 12/20] nvme/031: do not open code target setup/cleanup Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 13/20] nvme: drop default trtype argument for _nvmet_connect_subsys Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 14/20] nvme: drop default trtype argument for _nvmet_passthru_target_connect Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 15/20] nvme: drop default subsysnqn argument from _nvme_{connect|disconnect}_subsys Daniel Wagner
2024-03-26 13:13 ` [PATCH blktests v3 16/20] nvme: drop default subsysnqn argument from _nvme_passthru_target_{setup|cleanup} Daniel Wagner
2024-03-29  8:05   ` Shinichiro Kawasaki
2024-03-26 13:13 ` [PATCH blktests v3 17/20] nvme: drop default subsysnqn argument from _nvmet_passthru_target_connect Daniel Wagner
2024-03-26 13:14 ` [PATCH blktests v3 18/20] nvme/{041,042,043,044,045,048}: do not pass default host{nqn|id} to _nvme_connect_subsys Daniel Wagner
2024-03-26 13:14 ` [PATCH blktests v3 19/20] nvme: don't assume namespace id Daniel Wagner
2024-03-26 13:14 ` [PATCH blktests v3 20/20] nvme/028: drop unused nvmedev Daniel Wagner
2024-03-29  8:05 ` [PATCH blktests v3 00/20] refactoring and various cleanups/fixes Shinichiro Kawasaki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240326131402.5092-5-dwagner@suse.de \
    --to=dwagner@suse.de \
    --cc=chaitanyak@nvidia.com \
    --cc=hare@suse.de \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=shinichiro.kawasaki@wdc.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.