nvme: remove "udevadm settle" after _nvme_connect_subsys

The previous commit introduced "udevadm settle" command at the end of
_nvme_connect_subsys. Then the command is no longer required after
calling _nvme_connect_subsys in test cases.

Reviewed-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/005 b/tests/nvme/005
index 6646b826ecfad9dc147d37c1a4174ec54aa2037c..4ca87ff48016d884294135c075cb3dd1668ec652 100755 (executable)
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -40,8 +40,6 @@ test() {
 
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 
-       udevadm settle
-
        echo 1 > "/sys/class/nvme/${nvmedev}/reset_controller"
 
        _nvme_disconnect_ctrl "${nvmedev}"

diff --git a/tests/nvme/008 b/tests/nvme/008
index 3921fc6992b24a058f45e44a4ab2546246fb83ec..bd5e10fbfb99a8013d60f037c869f9f592e8b612 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -40,8 +40,6 @@ test() {
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
-       udevadm settle
-
        _nvme_disconnect_subsys "${def_subsysnqn}"
 
        _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"

diff --git a/tests/nvme/009 b/tests/nvme/009
index aac3c1e0f642b9c8ddd756fd0d3bbb7882463af9..c9a4b57ac2886d4837145ee5281a3226114c2155 100755 (executable)
--- a/tests/nvme/009
+++ b/tests/nvme/009
@@ -36,8 +36,6 @@ test() {
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 
-       udevadm settle
-
        _nvme_disconnect_subsys "${def_subsysnqn}"
 
        _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"

diff --git a/tests/nvme/040 b/tests/nvme/040
index 1a9be5c9342ced6afe0ba6db7364ffb6245202c8..ed6df3bbed5206bb40f8f68f5640b373342ce5b0 100755 (executable)
--- a/tests/nvme/040
+++ b/tests/nvme/040
@@ -35,7 +35,6 @@ test() {
        _create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
 
        _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
-       udevadm settle
        nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
 
        # start fio job

diff --git a/tests/nvme/041 b/tests/nvme/041
index cb2766619b0e814ea57d23021f71c6da3cdbcfeb..bc84412ccb46bc68e41a4a6aca756e20287d658e 100755 (executable)
--- a/tests/nvme/041
+++ b/tests/nvme/041
@@ -57,8 +57,6 @@ test() {
                             --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}"
 
-       udevadm settle
-
        _nvme_disconnect_subsys "${def_subsysnqn}"
 
        _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"

diff --git a/tests/nvme/042 b/tests/nvme/042
index 9180fce17b4e79eee9540831aedfc8f1bf251bf9..47e1b95ffdc662108161118ceaf0963d1acf5f95 100755 (executable)
--- a/tests/nvme/042
+++ b/tests/nvme/042
@@ -50,7 +50,6 @@ test() {
                                     --hostnqn "${def_hostnqn}" \
                                     --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"
-               udevadm settle
 
                _nvme_disconnect_subsys "${def_subsysnqn}"
        done
@@ -69,8 +68,6 @@ test() {
                                     --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"
 
-               udevadm settle
-
                _nvme_disconnect_subsys "${def_subsysnqn}"
        done
 

diff --git a/tests/nvme/043 b/tests/nvme/043
index f08422949efbab9a9c3484e12baf33f8f1faffc9..15676f88d5565229aa8940cd751b456014879f1a 100755 (executable)
--- a/tests/nvme/043
+++ b/tests/nvme/043
@@ -55,8 +55,6 @@ test() {
                                     --hostid "${def_hostid}" \
                                     --dhchap-secret "${hostkey}"
 
-               udevadm settle
-
                _nvme_disconnect_subsys "${def_subsysnqn}"
        done
 
@@ -71,8 +69,6 @@ test() {
                                      --hostid "${def_hostid}" \
                                      --dhchap-secret "${hostkey}"
 
-               udevadm settle
-
                _nvme_disconnect_subsys "${def_subsysnqn}"
        done
 

diff --git a/tests/nvme/044 b/tests/nvme/044
index 5eb163db2c99e496243b675e508c8e77f8aa53bc..9407ac6338c88b4ac30f6acd2462eda648d99c67 100755 (executable)
--- a/tests/nvme/044
+++ b/tests/nvme/044
@@ -59,8 +59,6 @@ test() {
                             --hostid "${def_hostid}" \
                             --dhchap-secret "${hostkey}"
 
-       udevadm settle
-
        _nvme_disconnect_subsys "${def_subsysnqn}"
 
        # Step 2: Connect with host authentication
@@ -72,8 +70,6 @@ test() {
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${hostkey}"
 
-       udevadm settle
-
        _nvme_disconnect_subsys "${def_subsysnqn}"
 
        # Step 3: Connect with host authentication
@@ -85,8 +81,6 @@ test() {
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${ctrlkey}"
 
-       udevadm settle
-
        _nvme_disconnect_subsys "${def_subsysnqn}"
 
        # Step 4: Connect with host authentication
@@ -99,8 +93,6 @@ test() {
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${invkey}"
 
-       udevadm settle
-
        _nvme_disconnect_subsys "${def_subsysnqn}"
 
        _remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"

diff --git a/tests/nvme/045 b/tests/nvme/045
index 8364d5ec3a2baa1135d0c5603070e2d86001f16c..396bcdefbcba43a559b6e04b32b133cefb8aa568 100755 (executable)
--- a/tests/nvme/045
+++ b/tests/nvme/045
@@ -61,8 +61,6 @@ test() {
                             --dhchap-secret "${hostkey}" \
                             --dhchap-ctrl-secret "${ctrlkey}"
 
-       udevadm settle
-
        echo "Re-authenticate with original host key"
 
        ctrldev=$(_find_nvme_dev "${def_subsysnqn}")