From: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Date: Fri, 10 Jun 2022 12:15:18 +0000 (+0900)
Subject: nvme/039: avoid module loads for various transport types
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fc2b5d61519c80fb5abb24c2ff368e4cf4763269;p=users%2Fhch%2Fblktests.git

nvme/039: avoid module loads for various transport types

The test case nvme/039 does not depend on nvme transport type and does
not require modules for the transport types. The _nvme_requires call in
requires() loads the modules and those modules are left unloaded after
the test case run. This causes failures of following nvmeof-mp test runs
with message:

  modprobe: FATAL: Module nvmet is in use.

To avoid the unnecessary module loads, remove _nvme_requires call.
Instead, just check existence of nvme command.

Fixes: 9accb5f86670 ("tests/nvme: add tests for error logging")
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Reviewed-by: Alan Adamson <alan.adamson@oracle.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
---

diff --git a/tests/nvme/039 b/tests/nvme/039
index 9ed5059..85827fa 100755
--- a/tests/nvme/039
+++ b/tests/nvme/039
@@ -13,7 +13,7 @@ DESCRIPTION="test error logging"
 QUICK=1
 
 requires() {
-	_nvme_requires
+	_have_program nvme
 	_have_kernel_option FAULT_INJECTION && \
 	    _have_kernel_option FAULT_INJECTION_DEBUG_FS
 }