From 95754cd170181f1f24d4c1552df88f02889cd5c2 Mon Sep 17 00:00:00 2001
From: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Date: Sun, 5 Jan 2020 18:14:53 -0500
Subject: [PATCH] bdevperf: Reorder state checks in spdk_bdevperf_shutdown_cb()

io_target_group manages io_targets, and hence checking g_head
should be done earlier than checking g_target_count.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I112018d8f487b387ae5f4f444a342be2c8da167d
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/479350
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
---
 test/bdev/bdevperf/bdevperf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c
index af49f53e5..ecc31e891 100644
--- a/test/bdev/bdevperf/bdevperf.c
+++ b/test/bdev/bdevperf/bdevperf.c
@@ -1343,13 +1343,13 @@ spdk_bdevperf_shutdown_cb(void)
 
 	g_shutdown = true;
 
-	if (g_target_count == 0) {
-		bdevperf_fini(g_run_rc);
+	if (TAILQ_EMPTY(&g_head)) {
+		spdk_app_stop(0);
 		return;
 	}
 
-	if (TAILQ_EMPTY(&g_head)) {
-		spdk_app_stop(0);
+	if (g_target_count == 0) {
+		bdevperf_fini(g_run_rc);
 		return;
 	}