* [PATCH 0/8] nvme: misc cleanups
@ 2019-02-19 23:28 Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 1/8] nvme/021: use consistent coding style Chaitanya Kulkarni
` (7 more replies)
0 siblings, 8 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-19 23:28 UTC (permalink / raw)
To: linux-block; +Cc: osandov, bvanassche, Chaitanya Kulkarni
Hi Omar,
This is a small patch series which follows the blktests codingi
style format as pointed out by Bart. Also minimizes the overall
code for the review.
-Regards,
Chaitanya
Chaitanya Kulkarni (8):
nvme/021: use consistent coding style
nvme/022: use consistent coding style
nvme/023: use consistent coding style
nvme/024: use consistent coding style
nvme/025: use consistent coding style
nvme/026: use consistent coding style
nvme/027: use consistent coding style
nvme/028: use consistent coding style
tests/nvme/021 | 15 ++++++---------
tests/nvme/021.out | 1 -
tests/nvme/022 | 16 ++++++----------
tests/nvme/022.out | 1 -
tests/nvme/023 | 16 ++++++----------
tests/nvme/023.out | 1 -
tests/nvme/024 | 16 ++++++----------
tests/nvme/024.out | 1 -
tests/nvme/025 | 16 ++++++----------
tests/nvme/025.out | 1 -
tests/nvme/026 | 16 ++++++----------
tests/nvme/026.out | 1 -
tests/nvme/027 | 16 ++++++----------
tests/nvme/027.out | 1 -
tests/nvme/028 | 17 ++++++-----------
tests/nvme/028.out | 1 -
16 files changed, 48 insertions(+), 88 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/8] nvme/021: use consistent coding style
2019-02-19 23:28 [PATCH 0/8] nvme: misc cleanups Chaitanya Kulkarni
@ 2019-02-19 23:28 ` Chaitanya Kulkarni
2019-02-20 18:10 ` Omar Sandoval
2019-02-19 23:28 ` [PATCH 2/8] nvme/022: " Chaitanya Kulkarni
` (6 subsequent siblings)
7 siblings, 1 reply; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-19 23:28 UTC (permalink / raw)
To: linux-block; +Cc: osandov, bvanassche, Chaitanya Kulkarni
---
tests/nvme/021 | 15 ++++++---------
tests/nvme/021.out | 1 -
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/tests/nvme/021 b/tests/nvme/021
index 8e9512a..f204a2f 100755
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -38,11 +38,13 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme list > /dev/null 2>&1
-
- rc=$?
+ if ! nvme list | grep -q "${nvmedev}n1" > /dev/null 2>&1; then
+ echo "Test Failed"
+ else
+ echo "Test complete"
+ fi
- nvme disconnect -n "${subsys_name}"
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -53,9 +55,4 @@ test() {
modprobe -r nvme-loop
modprobe -r nvmet
- if [ $rc -ne 0 ]; then
- echo "Test Failed"
- else
- echo "Test complete"
- fi
}
diff --git a/tests/nvme/021.out b/tests/nvme/021.out
index 5fb0601..b6b1a7c 100644
--- a/tests/nvme/021.out
+++ b/tests/nvme/021.out
@@ -1,5 +1,4 @@
Running nvme/021
91fdba0d-f87b-4c25-b80f-db7be1418b9e
uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
Test complete
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/8] nvme/022: use consistent coding style
2019-02-19 23:28 [PATCH 0/8] nvme: misc cleanups Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 1/8] nvme/021: use consistent coding style Chaitanya Kulkarni
@ 2019-02-19 23:28 ` Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 3/8] nvme/023: " Chaitanya Kulkarni
` (5 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-19 23:28 UTC (permalink / raw)
To: linux-block; +Cc: osandov, bvanassche, Chaitanya Kulkarni
---
tests/nvme/022 | 16 ++++++----------
tests/nvme/022.out | 1 -
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/tests/nvme/022 b/tests/nvme/022
index 8f89d03..3b5a101 100755
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -38,11 +38,13 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme reset "/dev/${nvmedev}" > /dev/null 2>&1
-
- rc=$?
+ if ! nvme reset "/dev/${nvmedev}" > /dev/null 2>&1; then
+ echo "Test Failed"
+ else
+ echo "Test complete"
+ fi
- nvme disconnect -n "${subsys_name}"
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -52,10 +54,4 @@ test() {
modprobe -r nvme-loop
modprobe -r nvmet
-
- if [ $rc -ne 0 ]; then
- echo "Test Failed"
- else
- echo "Test complete"
- fi
}
diff --git a/tests/nvme/022.out b/tests/nvme/022.out
index 173158a..1d393db 100644
--- a/tests/nvme/022.out
+++ b/tests/nvme/022.out
@@ -1,5 +1,4 @@
Running nvme/022
91fdba0d-f87b-4c25-b80f-db7be1418b9e
uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
Test complete
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/8] nvme/023: use consistent coding style
2019-02-19 23:28 [PATCH 0/8] nvme: misc cleanups Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 1/8] nvme/021: use consistent coding style Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 2/8] nvme/022: " Chaitanya Kulkarni
@ 2019-02-19 23:28 ` Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 4/8] nvme/024: " Chaitanya Kulkarni
` (4 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-19 23:28 UTC (permalink / raw)
To: linux-block; +Cc: osandov, bvanassche, Chaitanya Kulkarni
---
tests/nvme/023 | 16 ++++++----------
tests/nvme/023.out | 1 -
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/tests/nvme/023 b/tests/nvme/023
index 3475104..c220c50 100755
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -41,11 +41,13 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme smart-log "/dev/${nvmedev}" -n 1 > /dev/null 2>&1
-
- rc=$?
+ if ! nvme smart-log "/dev/${nvmedev}" -n 1 > /dev/null 2>&1; then
+ echo "Test Failed"
+ else
+ echo "Test complete"
+ fi
- nvme disconnect -n "${subsys_name}"
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -57,10 +59,4 @@ test() {
modprobe -r nvme-loop
modprobe -r nvmet
-
- if [ $rc -ne 0 ]; then
- echo "Test Failed"
- else
- echo "Test complete"
- fi
}
diff --git a/tests/nvme/023.out b/tests/nvme/023.out
index aeb3ea7..47c99ca 100644
--- a/tests/nvme/023.out
+++ b/tests/nvme/023.out
@@ -1,5 +1,4 @@
Running nvme/023
91fdba0d-f87b-4c25-b80f-db7be1418b9e
uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
Test complete
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/8] nvme/024: use consistent coding style
2019-02-19 23:28 [PATCH 0/8] nvme: misc cleanups Chaitanya Kulkarni
` (2 preceding siblings ...)
2019-02-19 23:28 ` [PATCH 3/8] nvme/023: " Chaitanya Kulkarni
@ 2019-02-19 23:28 ` Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 5/8] nvme/025: " Chaitanya Kulkarni
` (3 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-19 23:28 UTC (permalink / raw)
To: linux-block; +Cc: osandov, bvanassche, Chaitanya Kulkarni
---
tests/nvme/024 | 16 ++++++----------
tests/nvme/024.out | 1 -
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/tests/nvme/024 b/tests/nvme/024
index 313f778..4b33717 100755
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -38,11 +38,13 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme smart-log "/dev/${nvmedev}" -n 1 > /dev/null 2>&1
-
- rc=$?
+ if ! nvme smart-log "/dev/${nvmedev}" -n 1 > /dev/null 2>&1; then
+ echo "Test Failed"
+ else
+ echo "Test complete"
+ fi
- nvme disconnect -n "${subsys_name}"
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -52,10 +54,4 @@ test() {
modprobe -r nvme-loop
modprobe -r nvmet
-
- if [ $rc -ne 0 ]; then
- echo "Test Failed"
- else
- echo "Test complete"
- fi
}
diff --git a/tests/nvme/024.out b/tests/nvme/024.out
index 737d22f..0b1a350 100644
--- a/tests/nvme/024.out
+++ b/tests/nvme/024.out
@@ -1,5 +1,4 @@
Running nvme/024
91fdba0d-f87b-4c25-b80f-db7be1418b9e
uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
Test complete
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/8] nvme/025: use consistent coding style
2019-02-19 23:28 [PATCH 0/8] nvme: misc cleanups Chaitanya Kulkarni
` (3 preceding siblings ...)
2019-02-19 23:28 ` [PATCH 4/8] nvme/024: " Chaitanya Kulkarni
@ 2019-02-19 23:28 ` Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 6/8] nvme/026: " Chaitanya Kulkarni
` (2 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-19 23:28 UTC (permalink / raw)
To: linux-block; +Cc: osandov, bvanassche, Chaitanya Kulkarni
---
tests/nvme/025 | 16 ++++++----------
tests/nvme/025.out | 1 -
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/tests/nvme/025 b/tests/nvme/025
index 741d374..c2092d3 100755
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -38,11 +38,13 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme effects-log "/dev/${nvmedev}" > /dev/null 2>&1
-
- rc=$?
+ if ! nvme effects-log "/dev/${nvmedev}" > /dev/null 2>&1; then
+ echo "Test Failed"
+ else
+ echo "Test complete"
+ fi
- nvme disconnect -n "${subsys_name}"
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -52,10 +54,4 @@ test() {
modprobe -r nvme-loop
modprobe -r nvmet
-
- if [ $rc -ne 0 ]; then
- echo "Test Failed"
- else
- echo "Test complete"
- fi
}
diff --git a/tests/nvme/025.out b/tests/nvme/025.out
index b700bc7..f15ff2f 100644
--- a/tests/nvme/025.out
+++ b/tests/nvme/025.out
@@ -1,5 +1,4 @@
Running nvme/025
91fdba0d-f87b-4c25-b80f-db7be1418b9e
uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
Test complete
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 6/8] nvme/026: use consistent coding style
2019-02-19 23:28 [PATCH 0/8] nvme: misc cleanups Chaitanya Kulkarni
` (4 preceding siblings ...)
2019-02-19 23:28 ` [PATCH 5/8] nvme/025: " Chaitanya Kulkarni
@ 2019-02-19 23:28 ` Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 7/8] nvme/027: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 8/8] nvme/028: " Chaitanya Kulkarni
7 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-19 23:28 UTC (permalink / raw)
To: linux-block; +Cc: osandov, bvanassche, Chaitanya Kulkarni
---
tests/nvme/026 | 16 ++++++----------
tests/nvme/026.out | 1 -
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/tests/nvme/026 b/tests/nvme/026
index f915579..cdb196d 100755
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -38,11 +38,13 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme ns-descs "/dev/${nvmedev}" -n 1 > /dev/null 2>&1
-
- rc=$?
+ if ! nvme ns-descs "/dev/${nvmedev}" -n 1 > /dev/null 2>&1; then
+ echo "Test Failed"
+ else
+ echo "Test complete"
+ fi
- nvme disconnect -n "${subsys_name}"
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -52,10 +54,4 @@ test() {
modprobe -r nvme-loop
modprobe -r nvmet
-
- if [ $rc -ne 0 ]; then
- echo "Test Failed"
- else
- echo "Test complete"
- fi
}
diff --git a/tests/nvme/026.out b/tests/nvme/026.out
index dcee481..c934cac 100644
--- a/tests/nvme/026.out
+++ b/tests/nvme/026.out
@@ -1,5 +1,4 @@
Running nvme/026
91fdba0d-f87b-4c25-b80f-db7be1418b9e
uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
Test complete
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 7/8] nvme/027: use consistent coding style
2019-02-19 23:28 [PATCH 0/8] nvme: misc cleanups Chaitanya Kulkarni
` (5 preceding siblings ...)
2019-02-19 23:28 ` [PATCH 6/8] nvme/026: " Chaitanya Kulkarni
@ 2019-02-19 23:28 ` Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 8/8] nvme/028: " Chaitanya Kulkarni
7 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-19 23:28 UTC (permalink / raw)
To: linux-block; +Cc: osandov, bvanassche, Chaitanya Kulkarni
---
tests/nvme/027 | 16 ++++++----------
tests/nvme/027.out | 1 -
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/tests/nvme/027 b/tests/nvme/027
index 8d47f56..2d11f56 100755
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -38,11 +38,13 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme ns-rescan "/dev/${nvmedev}" > /dev/null 2>&1
-
- rc=$?
+ if ! nvme ns-rescan "/dev/${nvmedev}" > /dev/null 2>&1; then
+ echo "Test Failed"
+ else
+ echo "Test complete"
+ fi
- nvme disconnect -n "${subsys_name}"
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -52,10 +54,4 @@ test() {
modprobe -r nvme-loop
modprobe -r nvmet
-
- if [ $rc -ne 0 ]; then
- echo "Test Failed"
- else
- echo "Test complete"
- fi
}
diff --git a/tests/nvme/027.out b/tests/nvme/027.out
index f114fcd..5c6ed26 100644
--- a/tests/nvme/027.out
+++ b/tests/nvme/027.out
@@ -1,5 +1,4 @@
Running nvme/027
91fdba0d-f87b-4c25-b80f-db7be1418b9e
uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
Test complete
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 8/8] nvme/028: use consistent coding style
2019-02-19 23:28 [PATCH 0/8] nvme: misc cleanups Chaitanya Kulkarni
` (6 preceding siblings ...)
2019-02-19 23:28 ` [PATCH 7/8] nvme/027: " Chaitanya Kulkarni
@ 2019-02-19 23:28 ` Chaitanya Kulkarni
7 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-19 23:28 UTC (permalink / raw)
To: linux-block; +Cc: osandov, bvanassche, Chaitanya Kulkarni
---
tests/nvme/028 | 17 ++++++-----------
tests/nvme/028.out | 1 -
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/tests/nvme/028 b/tests/nvme/028
index 3478acc..ad8e89b 100755
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -38,11 +38,12 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme list-subsys | grep -q loop
-
- rc=$?
-
- nvme disconnect -n "${subsys_name}"
+ if ! nvme list-subsys | grep -q loop; then
+ echo "Test Failed"
+ else
+ echo "Test complete"
+ fi
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -52,10 +53,4 @@ test() {
modprobe -r nvme-loop
modprobe -r nvmet
-
- if [ $rc -ne 0 ]; then
- echo "Test Failed"
- else
- echo "Test complete"
- fi
}
diff --git a/tests/nvme/028.out b/tests/nvme/028.out
index c92b82d..536067f 100644
--- a/tests/nvme/028.out
+++ b/tests/nvme/028.out
@@ -1,5 +1,4 @@
Running nvme/028
91fdba0d-f87b-4c25-b80f-db7be1418b9e
uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
-NQN:blktests-subsystem-1 disconnected 1 controller(s)
Test complete
--
1.8.3.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/8] nvme/021: use consistent coding style
2019-02-19 23:28 ` [PATCH 1/8] nvme/021: use consistent coding style Chaitanya Kulkarni
@ 2019-02-20 18:10 ` Omar Sandoval
2019-02-20 18:19 ` Chaitanya Kulkarni
0 siblings, 1 reply; 12+ messages in thread
From: Omar Sandoval @ 2019-02-20 18:10 UTC (permalink / raw)
To: Chaitanya Kulkarni; +Cc: linux-block, bvanassche
On Tue, Feb 19, 2019 at 03:28:18PM -0800, Chaitanya Kulkarni wrote:
> ---
> tests/nvme/021 | 15 ++++++---------
> tests/nvme/021.out | 1 -
> 2 files changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/tests/nvme/021 b/tests/nvme/021
> index 8e9512a..f204a2f 100755
> --- a/tests/nvme/021
> +++ b/tests/nvme/021
> @@ -38,11 +38,13 @@ test() {
> cat "/sys/block/${nvmedev}n1/uuid"
> cat "/sys/block/${nvmedev}n1/wwid"
>
> - nvme list > /dev/null 2>&1
> -
> - rc=$?
> + if ! nvme list | grep -q "${nvmedev}n1" > /dev/null 2>&1; then
> + echo "Test Failed"
> + else
> + echo "Test complete"
> + fi
>
> - nvme disconnect -n "${subsys_name}"
> + nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
>
> _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
> _remove_nvmet_subsystem "${subsys_name}"
> @@ -53,9 +55,4 @@ test() {
> modprobe -r nvme-loop
> modprobe -r nvmet
>
> - if [ $rc -ne 0 ]; then
> - echo "Test Failed"
> - else
> - echo "Test complete"
> - fi
> }
> diff --git a/tests/nvme/021.out b/tests/nvme/021.out
> index 5fb0601..b6b1a7c 100644
> --- a/tests/nvme/021.out
> +++ b/tests/nvme/021.out
> @@ -1,5 +1,4 @@
> Running nvme/021
> 91fdba0d-f87b-4c25-b80f-db7be1418b9e
> uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
> -NQN:blktests-subsystem-1 disconnected 1 controller(s)
> Test complete
> --
> 1.8.3.1
>
For all of these, I think it'd be useful to have a more descriptive
error, like so:
diff --git a/tests/nvme/021 b/tests/nvme/021
index 8e9512a..0b215c4 100755
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -38,9 +38,9 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme list > /dev/null 2>&1
-
- rc=$?
+ if ! nvme list | grep -q "${nvmedev}n1"; then
+ echo "NVMeOF device not listed"
+ fi
nvme disconnect -n "${subsys_name}"
@@ -53,9 +53,5 @@ test() {
modprobe -r nvme-loop
modprobe -r nvmet
- if [ $rc -ne 0 ]; then
- echo "Test Failed"
- else
- echo "Test complete"
- fi
+ echo "Test complete"
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/8] nvme/021: use consistent coding style
2019-02-20 18:10 ` Omar Sandoval
@ 2019-02-20 18:19 ` Chaitanya Kulkarni
2019-02-20 18:23 ` Omar Sandoval
0 siblings, 1 reply; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-20 18:19 UTC (permalink / raw)
To: Omar Sandoval; +Cc: linux-block, bvanassche
On 02/20/2019 10:11 AM, Omar Sandoval wrote:
> On Tue, Feb 19, 2019 at 03:28:18PM -0800, Chaitanya Kulkarni wrote:
>> ---
>> tests/nvme/021 | 15 ++++++---------
>> tests/nvme/021.out | 1 -
>> 2 files changed, 6 insertions(+), 10 deletions(-)
>>
>> diff --git a/tests/nvme/021 b/tests/nvme/021
>> index 8e9512a..f204a2f 100755
>> --- a/tests/nvme/021
>> +++ b/tests/nvme/021
>> @@ -38,11 +38,13 @@ test() {
>> cat "/sys/block/${nvmedev}n1/uuid"
>> cat "/sys/block/${nvmedev}n1/wwid"
>>
>> - nvme list > /dev/null 2>&1
>> -
>> - rc=$?
>> + if ! nvme list | grep -q "${nvmedev}n1" > /dev/null 2>&1; then
>> + echo "Test Failed"
>> + else
>> + echo "Test complete"
>> + fi
>>
>> - nvme disconnect -n "${subsys_name}"
>> + nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
>>
>> _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
>> _remove_nvmet_subsystem "${subsys_name}"
>> @@ -53,9 +55,4 @@ test() {
>> modprobe -r nvme-loop
>> modprobe -r nvmet
>>
>> - if [ $rc -ne 0 ]; then
>> - echo "Test Failed"
>> - else
>> - echo "Test complete"
>> - fi
>> }
>> diff --git a/tests/nvme/021.out b/tests/nvme/021.out
>> index 5fb0601..b6b1a7c 100644
>> --- a/tests/nvme/021.out
>> +++ b/tests/nvme/021.out
>> @@ -1,5 +1,4 @@
>> Running nvme/021
>> 91fdba0d-f87b-4c25-b80f-db7be1418b9e
>> uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
>> -NQN:blktests-subsystem-1 disconnected 1 controller(s)
>> Test complete
>> --
>> 1.8.3.1
>>
>
> For all of these, I think it'd be useful to have a more descriptive
> error, like so:
>
> diff --git a/tests/nvme/021 b/tests/nvme/021
> index 8e9512a..0b215c4 100755
> --- a/tests/nvme/021
> +++ b/tests/nvme/021
> @@ -38,9 +38,9 @@ test() {
> cat "/sys/block/${nvmedev}n1/uuid"
> cat "/sys/block/${nvmedev}n1/wwid"
>
> - nvme list > /dev/null 2>&1
> -
> - rc=$?
> + if ! nvme list | grep -q "${nvmedev}n1"; then
> + echo "NVMeOF device not listed"
> + fi
>
> nvme disconnect -n "${subsys_name}"
>
> @@ -53,9 +53,5 @@ test() {
> modprobe -r nvme-loop
> modprobe -r nvmet
>
> - if [ $rc -ne 0 ]; then
> - echo "Test Failed"
> - else
> - echo "Test complete"
> - fi
> + echo "Test complete"
> }
>
Okay, will send out a new version along with if any more
comments that you have.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/8] nvme/021: use consistent coding style
2019-02-20 18:19 ` Chaitanya Kulkarni
@ 2019-02-20 18:23 ` Omar Sandoval
0 siblings, 0 replies; 12+ messages in thread
From: Omar Sandoval @ 2019-02-20 18:23 UTC (permalink / raw)
To: Chaitanya Kulkarni; +Cc: linux-block, bvanassche
On Wed, Feb 20, 2019 at 06:19:58PM +0000, Chaitanya Kulkarni wrote:
> On 02/20/2019 10:11 AM, Omar Sandoval wrote:
> > On Tue, Feb 19, 2019 at 03:28:18PM -0800, Chaitanya Kulkarni wrote:
> >> ---
> >> tests/nvme/021 | 15 ++++++---------
> >> tests/nvme/021.out | 1 -
> >> 2 files changed, 6 insertions(+), 10 deletions(-)
> >>
> >> diff --git a/tests/nvme/021 b/tests/nvme/021
> >> index 8e9512a..f204a2f 100755
> >> --- a/tests/nvme/021
> >> +++ b/tests/nvme/021
> >> @@ -38,11 +38,13 @@ test() {
> >> cat "/sys/block/${nvmedev}n1/uuid"
> >> cat "/sys/block/${nvmedev}n1/wwid"
> >>
> >> - nvme list > /dev/null 2>&1
> >> -
> >> - rc=$?
> >> + if ! nvme list | grep -q "${nvmedev}n1" > /dev/null 2>&1; then
> >> + echo "Test Failed"
> >> + else
> >> + echo "Test complete"
> >> + fi
> >>
> >> - nvme disconnect -n "${subsys_name}"
> >> + nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
> >>
> >> _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
> >> _remove_nvmet_subsystem "${subsys_name}"
> >> @@ -53,9 +55,4 @@ test() {
> >> modprobe -r nvme-loop
> >> modprobe -r nvmet
> >>
> >> - if [ $rc -ne 0 ]; then
> >> - echo "Test Failed"
> >> - else
> >> - echo "Test complete"
> >> - fi
> >> }
> >> diff --git a/tests/nvme/021.out b/tests/nvme/021.out
> >> index 5fb0601..b6b1a7c 100644
> >> --- a/tests/nvme/021.out
> >> +++ b/tests/nvme/021.out
> >> @@ -1,5 +1,4 @@
> >> Running nvme/021
> >> 91fdba0d-f87b-4c25-b80f-db7be1418b9e
> >> uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
> >> -NQN:blktests-subsystem-1 disconnected 1 controller(s)
> >> Test complete
> >> --
> >> 1.8.3.1
> >>
> >
> > For all of these, I think it'd be useful to have a more descriptive
> > error, like so:
> >
> > diff --git a/tests/nvme/021 b/tests/nvme/021
> > index 8e9512a..0b215c4 100755
> > --- a/tests/nvme/021
> > +++ b/tests/nvme/021
> > @@ -38,9 +38,9 @@ test() {
> > cat "/sys/block/${nvmedev}n1/uuid"
> > cat "/sys/block/${nvmedev}n1/wwid"
> >
> > - nvme list > /dev/null 2>&1
> > -
> > - rc=$?
> > + if ! nvme list | grep -q "${nvmedev}n1"; then
> > + echo "NVMeOF device not listed"
> > + fi
> >
> > nvme disconnect -n "${subsys_name}"
> >
> > @@ -53,9 +53,5 @@ test() {
> > modprobe -r nvme-loop
> > modprobe -r nvmet
> >
> > - if [ $rc -ne 0 ]; then
> > - echo "Test Failed"
> > - else
> > - echo "Test complete"
> > - fi
> > + echo "Test complete"
> > }
> >
>
> Okay, will send out a new version along with if any more
> comments that you have.
The same comment applies for the rest, but I don't have any other
concerns.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-02-20 18:24 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-19 23:28 [PATCH 0/8] nvme: misc cleanups Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 1/8] nvme/021: use consistent coding style Chaitanya Kulkarni
2019-02-20 18:10 ` Omar Sandoval
2019-02-20 18:19 ` Chaitanya Kulkarni
2019-02-20 18:23 ` Omar Sandoval
2019-02-19 23:28 ` [PATCH 2/8] nvme/022: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 3/8] nvme/023: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 4/8] nvme/024: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 5/8] nvme/025: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 6/8] nvme/026: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 7/8] nvme/027: " Chaitanya Kulkarni
2019-02-19 23:28 ` [PATCH 8/8] nvme/028: " Chaitanya Kulkarni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).