* [PATCH V2 1/8] nvme/021: use consistent coding style
2019-02-21 4:42 [PATCH V2 0/8] nvme: misc cleanups Chaitanya Kulkarni
@ 2019-02-21 4:42 ` Chaitanya Kulkarni
2019-02-21 4:42 ` [PATCH V2 2/8] nvme/022: " Chaitanya Kulkarni
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-21 4:42 UTC (permalink / raw)
To: linux-block; +Cc: osandov, Chaitanya Kulkarni
---
tests/nvme/021 | 14 +++++---------
tests/nvme/021.out | 1 -
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/tests/nvme/021 b/tests/nvme/021
index 8e9512a..fe7ac5b 100755
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -38,11 +38,11 @@ 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 "ERROR: device not listed"
+ 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 +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"
}
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
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 2/8] nvme/022: use consistent coding style
2019-02-21 4:42 [PATCH V2 0/8] nvme: misc cleanups Chaitanya Kulkarni
2019-02-21 4:42 ` [PATCH V2 1/8] nvme/021: use consistent coding style Chaitanya Kulkarni
@ 2019-02-21 4:42 ` Chaitanya Kulkarni
2019-02-21 4:42 ` [PATCH V2 3/8] nvme/023: " Chaitanya Kulkarni
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-21 4:42 UTC (permalink / raw)
To: linux-block; +Cc: osandov, Chaitanya Kulkarni
---
tests/nvme/022 | 14 +++++---------
tests/nvme/022.out | 1 -
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/tests/nvme/022 b/tests/nvme/022
index 8f89d03..35ab3e8 100755
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -38,11 +38,11 @@ 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 "ERROR: reset failed"
+ 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 +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"
}
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
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 3/8] nvme/023: use consistent coding style
2019-02-21 4:42 [PATCH V2 0/8] nvme: misc cleanups Chaitanya Kulkarni
2019-02-21 4:42 ` [PATCH V2 1/8] nvme/021: use consistent coding style Chaitanya Kulkarni
2019-02-21 4:42 ` [PATCH V2 2/8] nvme/022: " Chaitanya Kulkarni
@ 2019-02-21 4:42 ` Chaitanya Kulkarni
2019-02-21 4:42 ` [PATCH V2 4/8] nvme/024: " Chaitanya Kulkarni
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-21 4:42 UTC (permalink / raw)
To: linux-block; +Cc: osandov, Chaitanya Kulkarni
---
tests/nvme/023 | 14 +++++---------
tests/nvme/023.out | 1 -
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/tests/nvme/023 b/tests/nvme/023
index 3475104..14033ed 100755
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -41,11 +41,11 @@ 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 "ERROR: smart-log bdev-ns failed"
+ 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}"
@@ -58,9 +58,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"
}
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
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 4/8] nvme/024: use consistent coding style
2019-02-21 4:42 [PATCH V2 0/8] nvme: misc cleanups Chaitanya Kulkarni
` (2 preceding siblings ...)
2019-02-21 4:42 ` [PATCH V2 3/8] nvme/023: " Chaitanya Kulkarni
@ 2019-02-21 4:42 ` Chaitanya Kulkarni
2019-02-21 4:42 ` [PATCH V2 5/8] nvme/025: " Chaitanya Kulkarni
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-21 4:42 UTC (permalink / raw)
To: linux-block; +Cc: osandov, Chaitanya Kulkarni
---
tests/nvme/024 | 15 +++++----------
tests/nvme/024.out | 1 -
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/tests/nvme/024 b/tests/nvme/024
index 313f778..09191c7 100755
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -38,11 +38,10 @@ 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=$?
-
- nvme disconnect -n "${subsys_name}"
+ if ! nvme smart-log "/dev/${nvmedev}" -n 1 > /dev/null 2>&1; then
+ echo "ERROR: smart-log file-ns failed"
+ fi
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -53,9 +52,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"
}
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
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 5/8] nvme/025: use consistent coding style
2019-02-21 4:42 [PATCH V2 0/8] nvme: misc cleanups Chaitanya Kulkarni
` (3 preceding siblings ...)
2019-02-21 4:42 ` [PATCH V2 4/8] nvme/024: " Chaitanya Kulkarni
@ 2019-02-21 4:42 ` Chaitanya Kulkarni
2019-02-21 4:42 ` [PATCH V2 6/8] nvme/026: " Chaitanya Kulkarni
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-21 4:42 UTC (permalink / raw)
To: linux-block; +Cc: osandov, Chaitanya Kulkarni
---
tests/nvme/025 | 14 +++++---------
tests/nvme/025.out | 1 -
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/tests/nvme/025 b/tests/nvme/025
index 741d374..68b8ed7 100755
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -38,11 +38,11 @@ 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 "ERROR: effects-log failed"
+ 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 +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"
}
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
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 6/8] nvme/026: use consistent coding style
2019-02-21 4:42 [PATCH V2 0/8] nvme: misc cleanups Chaitanya Kulkarni
` (4 preceding siblings ...)
2019-02-21 4:42 ` [PATCH V2 5/8] nvme/025: " Chaitanya Kulkarni
@ 2019-02-21 4:42 ` Chaitanya Kulkarni
2019-02-21 4:42 ` [PATCH V2 7/8] nvme/027: " Chaitanya Kulkarni
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-21 4:42 UTC (permalink / raw)
To: linux-block; +Cc: osandov, Chaitanya Kulkarni
---
tests/nvme/026 | 14 +++++---------
tests/nvme/026.out | 1 -
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/tests/nvme/026 b/tests/nvme/026
index f915579..ae37aa7 100755
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -38,11 +38,11 @@ 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 "ERROR: ns-desc failed"
+ 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 +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"
}
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
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 7/8] nvme/027: use consistent coding style
2019-02-21 4:42 [PATCH V2 0/8] nvme: misc cleanups Chaitanya Kulkarni
` (5 preceding siblings ...)
2019-02-21 4:42 ` [PATCH V2 6/8] nvme/026: " Chaitanya Kulkarni
@ 2019-02-21 4:42 ` Chaitanya Kulkarni
2019-02-21 4:42 ` [PATCH V2 8/8] nvme/028: " Chaitanya Kulkarni
2019-02-27 18:50 ` [PATCH V2 0/8] nvme: misc cleanups Omar Sandoval
8 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-21 4:42 UTC (permalink / raw)
To: linux-block; +Cc: osandov, Chaitanya Kulkarni
---
tests/nvme/027 | 15 +++++----------
tests/nvme/027.out | 1 -
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/tests/nvme/027 b/tests/nvme/027
index 8d47f56..96107e2 100755
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -38,11 +38,10 @@ test() {
cat "/sys/block/${nvmedev}n1/uuid"
cat "/sys/block/${nvmedev}n1/wwid"
- nvme ns-rescan "/dev/${nvmedev}" > /dev/null 2>&1
-
- rc=$?
-
- nvme disconnect -n "${subsys_name}"
+ if ! nvme ns-rescan "/dev/${nvmedev}" > /dev/null 2>&1; then
+ echo "ERROR: ns-rescan failed"
+ fi
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -53,9 +52,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"
}
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
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH V2 8/8] nvme/028: use consistent coding style
2019-02-21 4:42 [PATCH V2 0/8] nvme: misc cleanups Chaitanya Kulkarni
` (6 preceding siblings ...)
2019-02-21 4:42 ` [PATCH V2 7/8] nvme/027: " Chaitanya Kulkarni
@ 2019-02-21 4:42 ` Chaitanya Kulkarni
2019-02-27 18:50 ` [PATCH V2 0/8] nvme: misc cleanups Omar Sandoval
8 siblings, 0 replies; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-02-21 4:42 UTC (permalink / raw)
To: linux-block; +Cc: osandov, Chaitanya Kulkarni
---
tests/nvme/028 | 15 +++++----------
tests/nvme/028.out | 1 -
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/tests/nvme/028 b/tests/nvme/028
index 3478acc..b7f84e4 100755
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -38,11 +38,10 @@ 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 "ERROR: list-subsys"
+ fi
+ nvme disconnect -n "${subsys_name}" > /dev/null 2>&1
_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
_remove_nvmet_subsystem "${subsys_name}"
@@ -53,9 +52,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"
}
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
--
2.19.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH V2 0/8] nvme: misc cleanups
2019-02-21 4:42 [PATCH V2 0/8] nvme: misc cleanups Chaitanya Kulkarni
` (7 preceding siblings ...)
2019-02-21 4:42 ` [PATCH V2 8/8] nvme/028: " Chaitanya Kulkarni
@ 2019-02-27 18:50 ` Omar Sandoval
2019-03-01 15:59 ` Chaitanya Kulkarni
8 siblings, 1 reply; 12+ messages in thread
From: Omar Sandoval @ 2019-02-27 18:50 UTC (permalink / raw)
To: Chaitanya Kulkarni; +Cc: linux-block
On Wed, Feb 20, 2019 at 08:42:40PM -0800, Chaitanya Kulkarni wrote:
> Hi Omar,
> This is a small patch series which follows the blktests coding
> style format as pointed out by Bart. Also minimizes the overall
> code for the review.
>
> -Regards,
> Chaitanya
>
> Changes since V1:-
> 1. Add testcase specific error message on failure.
I also made these redirect to $FULL instead of /dev/null. The result is
pushed to https://github.com/osandov/blktests/commits/nvme-cleanups,
could you take a quick look?
Also, I assume I can add your signed-off-by to all of these commits?
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH V2 0/8] nvme: misc cleanups
2019-02-27 18:50 ` [PATCH V2 0/8] nvme: misc cleanups Omar Sandoval
@ 2019-03-01 15:59 ` Chaitanya Kulkarni
2019-03-04 19:10 ` Omar Sandoval
0 siblings, 1 reply; 12+ messages in thread
From: Chaitanya Kulkarni @ 2019-03-01 15:59 UTC (permalink / raw)
To: Omar Sandoval; +Cc: linux-block@vger.kernel.org
Hi Omar,
Everything looks good.
On 2/27/19, 1:50 PM, "Omar Sandoval" <osandov@osandov.com> wrote:
On Wed, Feb 20, 2019 at 08:42:40PM -0800, Chaitanya Kulkarni wrote:
> Hi Omar,
> This is a small patch series which follows the blktests coding
> style format as pointed out by Bart. Also minimizes the overall
> code for the review.
>
> -Regards,
> Chaitanya
>
> Changes since V1:-
> 1. Add testcase specific error message on failure.
I also made these redirect to $FULL instead of /dev/null. The result is
pushed to https://github.com/osandov/blktests/commits/nvme-cleanups,
could you take a quick look?
Also, I assume I can add your signed-off-by to all of these commits?
Yes, feel free to add that.
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH V2 0/8] nvme: misc cleanups
2019-03-01 15:59 ` Chaitanya Kulkarni
@ 2019-03-04 19:10 ` Omar Sandoval
0 siblings, 0 replies; 12+ messages in thread
From: Omar Sandoval @ 2019-03-04 19:10 UTC (permalink / raw)
To: Chaitanya Kulkarni; +Cc: linux-block@vger.kernel.org
On Fri, Mar 01, 2019 at 03:59:53PM +0000, Chaitanya Kulkarni wrote:
> Hi Omar,
>
> Everything looks good.
>
> On 2/27/19, 1:50 PM, "Omar Sandoval" <osandov@osandov.com> wrote:
>
> On Wed, Feb 20, 2019 at 08:42:40PM -0800, Chaitanya Kulkarni wrote:
> > Hi Omar,
> > This is a small patch series which follows the blktests coding
> > style format as pointed out by Bart. Also minimizes the overall
> > code for the review.
> >
> > -Regards,
> > Chaitanya
> >
> > Changes since V1:-
> > 1. Add testcase specific error message on failure.
>
> I also made these redirect to $FULL instead of /dev/null. The result is
> pushed to https://github.com/osandov/blktests/commits/nvme-cleanups,
> could you take a quick look?
>
> Also, I assume I can add your signed-off-by to all of these commits?
> Yes, feel free to add that.
Thanks, merged.
^ permalink raw reply [flat|nested] 12+ messages in thread