From: Anand Jain Date: Wed, 17 Dec 2025 17:00:22 +0000 (+0800) Subject: fstests: fix flaky device name in _cleanup_flakey X-Git-Tag: v2026.01.05~12 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a1521a039d43a106b301bef17267c82686ddf6a;p=xfstests-dev.git fstests: fix flaky device name in _cleanup_flakey There is no device named flakey-test, which _cleanup_flakey() currently uses. The actual device name is stored in $FLAKEY_NAME and is set to flakey-test.$seq. Use $FLAKEY_NAME instead. Signed-off-by: Anand Jain Fixes: 603030dee015ba ("fstests: per-test dmflakey instances") Reviewed-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Zorro Lang --- diff --git a/common/dmflakey b/common/dmflakey index cb035990..6ac666f5 100644 --- a/common/dmflakey +++ b/common/dmflakey @@ -76,7 +76,7 @@ _cleanup_flakey() # otherwise the umount will hang test -n "$NON_FLAKEY_LOGDEV" && $DMSETUP_PROG resume $FLAKEY_LOGNAME &> /dev/null test -n "$NON_FLAKEY_RTDEV" && $DMSETUP_PROG resume $FLAKEY_RTNAME &> /dev/null - test -n "$NON_FLAKEY_DEV" && $DMSETUP_PROG resume flakey-test > /dev/null 2>&1 + test -n "$NON_FLAKEY_DEV" && $DMSETUP_PROG resume $FLAKEY_NAME &> /dev/null _unmount $SCRATCH_MNT > /dev/null 2>&1