public inbox for [email protected]
 help / color / mirror / Atom feed
From: Jeff Moyer <[email protected]>
To: [email protected]
Cc: [email protected]
Subject: [liburing patch][v2] test: fix up dead code bugs
Date: Tue, 12 Nov 2019 19:04:25 -0500	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]> (Jeff Moyer's message of "Tue, 12 Nov 2019 18:47:41 -0500")

Coverity pointed out some dead code.  Fix it.

Signed-off-by: Jeff Moyer <[email protected]>

---
v2: Don't re-introduce dead-code! (Jens Axboe)

diff --git a/test/fsync.c b/test/fsync.c
index e6e0898..1a1890e 100644
--- a/test/fsync.c
+++ b/test/fsync.c
@@ -96,14 +96,14 @@ static int test_barrier_fsync(struct io_uring *ring)
 	io_uring_sqe_set_flags(sqe, IOSQE_IO_DRAIN);
 
 	ret = io_uring_submit(ring);
-	if (ret < 5) {
-		printf("Submitted only %d\n", ret);
-		goto err;
-	} else if (ret < 0) {
+	if (ret < 0) {
 		printf("sqe submit failed\n");
 		if (ret == EINVAL)
 			printf("kernel may not support barrier fsync yet\n");
 		goto err;
+	} else if (ret < 5) {
+		printf("Submitted only %d\n", ret);
+		goto err;
 	}
 
 	for (i = 0; i < 5; i++) {
diff --git a/test/nop.c b/test/nop.c
index 1373695..4b072fc 100644
--- a/test/nop.c
+++ b/test/nop.c
@@ -62,12 +62,12 @@ static int test_barrier_nop(struct io_uring *ring)
 	}
 
 	ret = io_uring_submit(ring);
-	if (ret < 8) {
-		printf("Submitted only %d\n", ret);
-		goto err;
-	} else if (ret < 0) {
+	if (ret < 0) {
 		printf("sqe submit failed: %d\n", ret);
 		goto err;
+	} else if (ret < 8) {
+		printf("Submitted only %d\n", ret);
+		goto err;
 	}
 
 	for (i = 0; i < 8; i++) {
diff --git a/test/stdout.c b/test/stdout.c
index 7b64c8c..b12d75c 100644
--- a/test/stdout.c
+++ b/test/stdout.c
@@ -28,12 +28,12 @@ static int test_pipe_io(struct io_uring *ring)
 	io_uring_prep_writev(sqe, STDOUT_FILENO, &vecs, 1, 0);
 
 	ret = io_uring_submit(ring);
-	if (ret < 1) {
-		printf("Submitted only %d\n", ret);
-		goto err;
-	} else if (ret < 0) {
+	if (ret < 0) {
 		printf("sqe submit failed: %d\n", ret);
 		goto err;
+	} else if (ret < 1) {
+		printf("Submitted only %d\n", ret);
+		goto err;
 	}
 
 	ret = io_uring_wait_cqe(ring, &cqe);


  parent reply	other threads:[~2019-11-13  0:04 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-12 23:47 [liburing patch] test: fix up dead code bugs Jeff Moyer
2019-11-12 23:59 ` Jens Axboe
2019-11-13  0:00   ` Jeff Moyer
2019-11-13  0:04 ` Jeff Moyer [this message]
2019-11-13  0:14   ` [liburing patch][v2] " Jens Axboe
2019-11-13 13:44     ` Jeff Moyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox