]> git-server-git.apps.pok.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
fstests: fix flaky device name in _cleanup_flakey
authorAnand Jain <asj@kernel.org>
Wed, 17 Dec 2025 17:00:22 +0000 (01:00 +0800)
committerZorro Lang <zlang@kernel.org>
Wed, 31 Dec 2025 22:18:07 +0000 (06:18 +0800)
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 <asj@kernel.org>
Fixes: 603030dee015ba ("fstests: per-test dmflakey instances")
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Zorro Lang <zlang@kernel.org>
common/dmflakey

index cb0359901c1637725008aab834c826f0a425ce4f..6ac666f5b61ea62c55c4acc1519baaf69355755e 100644 (file)
@@ -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