diff mbox series

[v1.1,1/2] common/xfs: support realtime devices with _scratch_xfs_admin

Message ID 20210325231932.GL1670408@magnolia (mailing list archive)
State New
Headers show
Series [v1.1,1/2] common/xfs: support realtime devices with _scratch_xfs_admin | expand

Commit Message

Darrick J. Wong March 25, 2021, 11:19 p.m. UTC
From: Darrick J. Wong <djwong@kernel.org>

Teach _scratch_xfs_admin to support passing the realtime device to
xfs_admin so that we can actually test xfs_admin functionality with
those setups.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
v1.1: fix rt_ops variable naming problems
---
 common/xfs |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/common/xfs b/common/xfs
index f5e98c1e..06989d1c 100644
--- a/common/xfs
+++ b/common/xfs
@@ -269,9 +269,15 @@  _test_xfs_db()
 _scratch_xfs_admin()
 {
 	local options=("$SCRATCH_DEV")
+	local rt_opts=()
 	[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
 		options+=("$SCRATCH_LOGDEV")
-	$XFS_ADMIN_PROG "$@" "${options[@]}"
+	if [ "$USE_EXTERNAL" = yes ] && [ -n "$SCRATCH_RTDEV" ]; then
+		$XFS_ADMIN_PROG --help 2>&1 | grep -q 'rtdev' || \
+			_notrun 'xfs_admin does not support rt devices'
+		rt_opts+=(-r "$SCRATCH_RTDEV")
+	fi
+	$XFS_ADMIN_PROG "${rt_opts[@]}" "$@" "${options[@]}"
 }
 
 _scratch_xfs_logprint()