From 02ecb2dcba470d9175ca2950ab8cff4e7cf2ffde Mon Sep 17 00:00:00 2001
From: Fengnan Chang <changfengnan@bytedance.com>
Date: Wed, 21 Dec 2022 10:52:43 +0800
Subject: [PATCH] nvme: make submit request error handle in one place

rc to -ENXIO and goto error, make all error handle in one place,
so it's easy to add more check in later patch.

Change-Id: I13edeef75bbf6c52e18d6b94b78c2e560012bfee
Signed-off-by: Fengnan Chang <changfengnan@bytedance.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16004
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Xiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 lib/nvme/nvme_qpair.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/nvme/nvme_qpair.c b/lib/nvme/nvme_qpair.c
index d7b4e3cc4..68de0284f 100644
--- a/lib/nvme/nvme_qpair.c
+++ b/lib/nvme/nvme_qpair.c
@@ -935,11 +935,9 @@ _nvme_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_request *r
 			nvme_request_free_children(child_req);
 			nvme_free_request(child_req);
 		}
-		if (req->parent != NULL) {
-			nvme_request_remove_child(req->parent, req);
-		}
-		nvme_free_request(req);
-		return -ENXIO;
+
+		rc = -ENXIO;
+		goto error;
 	}
 
 	if (req->num_children) {