From b9a67e983ac5d3b4f42a1c7186cf443c79023925 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 18 Jul 2016 09:06:52 -0700 Subject: [PATCH] nvmf: remove nvmf_property_set() shutdown flag Property Set of CC.SHN is not supposed to terminate the session - remove the commented-out code that was attempting to do this. Change-Id: I1db230df9be549764287a8fd45ccdebea1d22a8b Signed-off-by: Daniel Verkamp --- lib/nvmf/request.c | 10 +--------- lib/nvmf/session.c | 3 +-- lib/nvmf/session.h | 3 +-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/nvmf/request.c b/lib/nvmf/request.c index 45c72b846..094931c7d 100644 --- a/lib/nvmf/request.c +++ b/lib/nvmf/request.c @@ -371,18 +371,10 @@ static bool nvmf_process_property_set(struct spdk_nvmf_request *req) { struct spdk_nvmf_fabric_prop_set_cmd *cmd; - bool shutdown = false; cmd = &req->cmd->prop_set_cmd; - nvmf_property_set(req->conn->sess, cmd, &req->rsp->nvme_cpl, &shutdown); - - /* TODO: This is not right. It should shut down the whole session. - if (shutdown == true) { - SPDK_TRACELOG(SPDK_TRACE_DEBUG, "Call to set properties has indicated shutdown\n"); - conn->state = CONN_STATE_FABRIC_DISCONNECT; - } - */ + nvmf_property_set(req->conn->sess, cmd, &req->rsp->nvme_cpl); return true; } diff --git a/lib/nvmf/session.c b/lib/nvmf/session.c index 215e4f64e..6637869ea 100644 --- a/lib/nvmf/session.c +++ b/lib/nvmf/session.c @@ -427,8 +427,7 @@ nvmf_property_get(struct nvmf_session *session, void nvmf_property_set(struct nvmf_session *session, struct spdk_nvmf_fabric_prop_set_cmd *cmd, - struct spdk_nvme_cpl *response, - bool *shutdown) + struct spdk_nvme_cpl *response) { const struct nvmf_prop *prop; uint64_t value; diff --git a/lib/nvmf/session.h b/lib/nvmf/session.h index 446331066..14c55652f 100644 --- a/lib/nvmf/session.h +++ b/lib/nvmf/session.h @@ -100,8 +100,7 @@ nvmf_property_get(struct nvmf_session *session, void nvmf_property_set(struct nvmf_session *session, struct spdk_nvmf_fabric_prop_set_cmd *cmd, - struct spdk_nvme_cpl *rsp, - bool *shutdown); + struct spdk_nvme_cpl *rsp); int spdk_nvmf_session_poll(struct nvmf_session *session);