Linux-NVME Archive on 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 v1 04/18] common/xfs: propagate errors from _xfs_run_fio_verify_io
Date: Thu, 21 Mar 2024 10:47:13 +0100	[thread overview]
Message-ID: <20240321094727.6503-5-dwagner@suse.de> (raw)
In-Reply-To: <20240321094727.6503-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-21 11:02 UTC|newest]

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

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=20240321094727.6503-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox