nvme: use _have_loop instead of _have_modules loop

Also check for the losetup existance.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/002 b/tests/nvme/002
index ca11c11c9a09fb25f940297c9168a3cd03a30ca3..6c6ae5fea89b73d86944b47978832f9861003dfb 100755 (executable)
--- a/tests/nvme/002
+++ b/tests/nvme/002
@@ -11,7 +11,7 @@ DESCRIPTION="create many subsystems and test discovery"
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_loop
 }
 

diff --git a/tests/nvme/003 b/tests/nvme/003
index 13649029d6fcf788d4833c0593a1828a2968a4d9..6604012d2068f9261dbb79146ae3bdfc8ddacbe7 100755 (executable)
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -12,7 +12,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
        _have_writeable_kmsg
 }

diff --git a/tests/nvme/004 b/tests/nvme/004
index 4b0b7ae50a5e93ec9353f6e52af4de1abbcac7ab..9dda538b1ac014a93137833b81b333008f21a5ff 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -13,7 +13,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/005 b/tests/nvme/005
index 9f3e388dc695a64af3fe78695c05ee5db3baa630..de567a74a891ee513312dfde1f2b69357660e09c 100755 (executable)
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -12,8 +12,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop && \
-               _have_module_param_value nvme_core multipath Y
+       _have_loop && _have_module_param_value nvme_core multipath Y
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/006 b/tests/nvme/006
index 9230dc6ed902e115b1603200b8c31f3ed3d35f9f..d993861c06ba77fa99b595c9f360873269f3bb61 100755 (executable)
--- a/tests/nvme/006
+++ b/tests/nvme/006
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/008 b/tests/nvme/008
index 219fe9b0ca6ad04bc6e213c6e6b99ca8def9859e..5568fe46e463cce2328d02170d399b47b1214e04 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/010 b/tests/nvme/010
index 08e39d5a44c9da070a5945bc7432565915785a8e..b7b1d5188e9beaba95645f31ab6ffc255d826d5a 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -11,7 +11,7 @@ TIMED=1
 
 requires() {
        _nvme_requires
-       _have_fio && _have_modules loop
+       _have_fio && _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/012 b/tests/nvme/012
index 6bb49720cdce04e570d390e7b49b98e0ec012b2d..c9d24388306df6a36d3c05f7294e0a4d5746e3d1 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -14,7 +14,7 @@ requires() {
        _nvme_requires
        _have_xfs
        _have_fio
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/014 b/tests/nvme/014
index 48f8caaec0b3e6d7fd1156ed3859fd9874ad0359..d13cff7921da4010b899e55a7576638ad457c5e5 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/015 b/tests/nvme/015
index e33cfde5d72e6c6c53cc8a8dbb0b013a41812bd0..bb52ba2598db1f0ecfbb9c10e056df4c8b7252aa 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/018 b/tests/nvme/018
index 7f407da2ce1950510c3bf8b5dafeb8c9ca1fd473..315e79534348aadcb19dda23e5b31b553a9fc82e 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -12,7 +12,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/019 b/tests/nvme/019
index 8259e2e0c1573afaf9926641a75f7c686bd56a69..4cb3509a12b21688dc1dc9614812798d08559e05 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/021 b/tests/nvme/021
index fb77f9cbd99f5dfbaed3d3772c8624d7aa885717..6ee0af1fe1581be0ae1e44eb5e386e4df995992b 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/022 b/tests/nvme/022
index 62c4690e35fed4690959527db4b6d8beb87901f4..1d76ffa441785a5f93554084dda2e6ecd14cbebf 100755 (executable)
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/023 b/tests/nvme/023
index bce21b56c9f1f9adf788b696d43313a782bfb83e..b65be07edc38ceb5bd215b5138a02b04e71b65a9 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/024 b/tests/nvme/024
index ffec36cf3333015d9fd45b467a6e83adeadcdf78..f756797d6f29f84d873ee1a648bbb8b06da7841a 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/025 b/tests/nvme/025
index 3d3f01bc45fd8a53264896dd1b286f72dbbd0eee..941bf36f67fb3913ed168b464dfd9c0ea9a0a829 100755 (executable)
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/026 b/tests/nvme/026
index 2f5607793cd3b21ebbc2aeff324669b821d7be82..c3f06c2a377c0f8064eb56df5666c2d7e4c030d8 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/027 b/tests/nvme/027
index 53f06646a3d0b1a01746fde1269081ab7e711307..0ad663ace811060f369d6e6aaaa2795301b32837 100755 (executable)
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/028 b/tests/nvme/028
index 3d9084f186364940c133eb5b75b2ae73f2aff6b6..7de977a812134332d7a5a1f53371616dc9a5e5a9 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/029 b/tests/nvme/029
index 960e5f5a63bf33746a6adbd45e2a640d4332142f..f8b4cbbb91560b8ddfaf209589aa558ffe75a953 100755 (executable)
--- a/tests/nvme/029
+++ b/tests/nvme/029
@@ -12,7 +12,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/030 b/tests/nvme/030
index c6d485eb062ccf43e31037f055596fb7ee476bf6..20fef696e565bc8badf5ec2e1fa30d1abfd60653 100755 (executable)
--- a/tests/nvme/030
+++ b/tests/nvme/030
@@ -11,7 +11,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }
 

diff --git a/tests/nvme/031 b/tests/nvme/031
index 7c18a6444b53b3a63a4adfd61fdad5ec2ffdb411..4e1798246db19e515c9d913f1d5b085d2c22ee57 100755 (executable)
--- a/tests/nvme/031
+++ b/tests/nvme/031
@@ -19,7 +19,7 @@ QUICK=1
 
 requires() {
        _nvme_requires
-       _have_modules loop
+       _have_loop
        _require_nvme_trtype_is_fabrics
 }