From: Hans Holmberg <Hans.Holmberg@wdc.com>
Date: Tue, 8 Oct 2024 10:52:04 +0000 (+0000)
Subject: common: make rt_ops local in _try_scratch_mkfs_sized
X-Git-Tag: v2024.10.14~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ffcda29e8a05a139593a46dea6ef75efdc6e805;p=xfstests-dev.git

common: make rt_ops local in _try_scratch_mkfs_sized

If we call _try_scratch_mkfs_size with $SCRATCH_RTDEV set followed by
a call with $SCRATCH_RTDEV cleared, rt_ops will have stale size
parameters that will cause mkfs.xfs to fail with:
"size specified for non-existent rt subvolume"

Make rt_ops local to fix this.

Signed-off-by: Hans Holmberg <hans.holmberg@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/common/rc b/common/rc
index 31710584..2af26f23 100644
--- a/common/rc
+++ b/common/rc
@@ -1030,6 +1030,7 @@ _try_scratch_mkfs_sized()
 	local blocksize=$2
 	local def_blksz
 	local blocksize_opt
+	local rt_ops
 
 	case $FSTYP in
 	xfs)