From: Yi Zhang <yi.zhang@redhat.com>
Date: Sat, 30 Jul 2022 07:58:28 +0000 (+0800)
Subject: block/002: remove debugfs check while blktrace is running
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=24585c78663a2b078358d2d9512a632039623f06;p=users%2Fhch%2Fblktests.git

block/002: remove debugfs check while blktrace is running

See kernel commit: 99d055b4fd4b ("block: remove per-disk debugfs files
in blk_unregister_queue")

This fix avoids the test case failure observed since the kernel commit
0a9a25ca7843 ("block: let blkcg_gq grab request queue's refcnt").

Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
[Shin'ichiro: improved commit message]
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
---

diff --git a/tests/block/002 b/tests/block/002
index 9b183e7..15b47a6 100755
--- a/tests/block/002
+++ b/tests/block/002
@@ -25,9 +25,6 @@ test() {
 	blktrace -D "$TMP_DIR" "/dev/${SCSI_DEBUG_DEVICES[0]}" >"$FULL" 2>&1 &
 	sleep 0.5
 	echo 1 > "/sys/block/${SCSI_DEBUG_DEVICES[0]}/device/delete"
-	if [[ ! -d /sys/kernel/debug/block/${SCSI_DEBUG_DEVICES[0]} ]]; then
-		echo "debugfs directory deleted with blktrace active"
-	fi
 	{ kill $!; wait; } >/dev/null 2>/dev/null
 	if [[ -d /sys/kernel/debug/block/${SCSI_DEBUG_DEVICES[0]} ]]; then
 		echo "debugfs directory leaked"