Skip to content

Commit 24b9ba0

Browse files
committed
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 <[email protected]> Signed-off-by: Shin'ichiro Kawasaki <[email protected]>
1 parent 8fc8eb1 commit 24b9ba0

9 files changed

Lines changed: 0 additions & 26 deletions

File tree

tests/nvme/005

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ test() {
4040

4141
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
4242

43-
udevadm settle
44-
4543
echo 1 > "/sys/class/nvme/${nvmedev}/reset_controller"
4644

4745
_nvme_disconnect_ctrl "${nvmedev}"

tests/nvme/008

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ test() {
4040
cat "/sys/block/${nvmedev}n1/uuid"
4141
cat "/sys/block/${nvmedev}n1/wwid"
4242

43-
udevadm settle
44-
4543
_nvme_disconnect_subsys "${def_subsysnqn}"
4644

4745
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"

tests/nvme/009

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ test() {
3636
cat "/sys/block/${nvmedev}n1/uuid"
3737
cat "/sys/block/${nvmedev}n1/wwid"
3838

39-
udevadm settle
40-
4139
_nvme_disconnect_subsys "${def_subsysnqn}"
4240

4341
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"

tests/nvme/040

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ test() {
3535
_create_nvmet_host "${def_subsysnqn}" "${def_hostnqn}"
3636

3737
_nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}"
38-
udevadm settle
3938
nvmedev=$(_find_nvme_dev "${def_subsysnqn}")
4039

4140
# start fio job

tests/nvme/041

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ test() {
5757
--hostid "${def_hostid}" \
5858
--dhchap-secret "${hostkey}"
5959

60-
udevadm settle
61-
6260
_nvme_disconnect_subsys "${def_subsysnqn}"
6361

6462
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"

tests/nvme/042

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ test() {
5050
--hostnqn "${def_hostnqn}" \
5151
--hostid "${def_hostid}" \
5252
--dhchap-secret "${hostkey}"
53-
udevadm settle
5453

5554
_nvme_disconnect_subsys "${def_subsysnqn}"
5655
done
@@ -69,8 +68,6 @@ test() {
6968
--hostid "${def_hostid}" \
7069
--dhchap-secret "${hostkey}"
7170

72-
udevadm settle
73-
7471
_nvme_disconnect_subsys "${def_subsysnqn}"
7572
done
7673

tests/nvme/043

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ test() {
5555
--hostid "${def_hostid}" \
5656
--dhchap-secret "${hostkey}"
5757

58-
udevadm settle
59-
6058
_nvme_disconnect_subsys "${def_subsysnqn}"
6159
done
6260

@@ -71,8 +69,6 @@ test() {
7169
--hostid "${def_hostid}" \
7270
--dhchap-secret "${hostkey}"
7371

74-
udevadm settle
75-
7672
_nvme_disconnect_subsys "${def_subsysnqn}"
7773
done
7874

tests/nvme/044

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ test() {
5959
--hostid "${def_hostid}" \
6060
--dhchap-secret "${hostkey}"
6161

62-
udevadm settle
63-
6462
_nvme_disconnect_subsys "${def_subsysnqn}"
6563

6664
# Step 2: Connect with host authentication
@@ -72,8 +70,6 @@ test() {
7270
--dhchap-secret "${hostkey}" \
7371
--dhchap-ctrl-secret "${hostkey}"
7472

75-
udevadm settle
76-
7773
_nvme_disconnect_subsys "${def_subsysnqn}"
7874

7975
# Step 3: Connect with host authentication
@@ -85,8 +81,6 @@ test() {
8581
--dhchap-secret "${hostkey}" \
8682
--dhchap-ctrl-secret "${ctrlkey}"
8783

88-
udevadm settle
89-
9084
_nvme_disconnect_subsys "${def_subsysnqn}"
9185

9286
# Step 4: Connect with host authentication
@@ -99,8 +93,6 @@ test() {
9993
--dhchap-secret "${hostkey}" \
10094
--dhchap-ctrl-secret "${invkey}"
10195

102-
udevadm settle
103-
10496
_nvme_disconnect_subsys "${def_subsysnqn}"
10597

10698
_remove_nvmet_subsystem_from_port "${port}" "${def_subsysnqn}"

tests/nvme/045

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ test() {
6161
--dhchap-secret "${hostkey}" \
6262
--dhchap-ctrl-secret "${ctrlkey}"
6363

64-
udevadm settle
65-
6664
echo "Re-authenticate with original host key"
6765

6866
ctrldev=$(_find_nvme_dev "${def_subsysnqn}")

0 commit comments

Comments
 (0)