From 040095db8607ab164f92c5e7bae5315ad6da09d6 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 16 Apr 2020 06:00:31 +0900 Subject: [PATCH] lib/iscsi: Remove unimplemented internal API from tgt_node.h spdk_iscsi_tgt_node_reset() is not implemented and the code to call it is commented out. We will have to implement them from scratch if we do. So remove them in this patch. Signed-off-by: Shuhei Matsumoto Change-Id: I63618b0f8857cb23b57f5a92ec363a91c1d5a912 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1885 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Paul Luse Reviewed-by: Tomasz Zawadzki Reviewed-by: Seth Howell --- lib/iscsi/iscsi.c | 23 +---------------------- lib/iscsi/tgt_node.h | 2 -- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index 69fee83e2..d50a0eebf 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -3718,33 +3718,12 @@ iscsi_pdu_hdr_op_task(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *pdu) case ISCSI_TASK_FUNC_TARGET_WARM_RESET: SPDK_NOTICELOG("TARGET_WARM_RESET (Unsupported)\n"); - -#if 0 - spdk_iscsi_drop_conns(conn, conn->initiator_name, 1 /* drop all */); - rc = spdk_iscsi_tgt_node_reset(conn->sess->target, lun); - if (rc < 0) { - SPDK_ERRLOG("tgt_node reset failed\n"); - } -#else task->scsi.response = SPDK_SCSI_TASK_MGMT_RESP_REJECT_FUNC_NOT_SUPPORTED; -#endif break; case ISCSI_TASK_FUNC_TARGET_COLD_RESET: - SPDK_NOTICELOG("TARGET_COLD_RESET\n"); - -#if 0 - spdk_iscsi_drop_conns(conn, conn->initiator_name, 1 /* drop all */); - - rc = spdk_iscsi_tgt_node_reset(conn->sess->target, lun); - if (rc < 0) { - SPDK_ERRLOG("tgt_node reset failed\n"); - } - - conn->state = ISCSI_CONN_STATE_EXITING; -#else + SPDK_NOTICELOG("TARGET_COLD_RESET (Unsupported)\n"); task->scsi.response = SPDK_SCSI_TASK_MGMT_RESP_REJECT_FUNC_NOT_SUPPORTED; -#endif break; case ISCSI_TASK_FUNC_TASK_REASSIGN: diff --git a/lib/iscsi/tgt_node.h b/lib/iscsi/tgt_node.h index c716d1d5c..f27551dfd 100644 --- a/lib/iscsi/tgt_node.h +++ b/lib/iscsi/tgt_node.h @@ -132,8 +132,6 @@ bool spdk_iscsi_tgt_node_access(struct spdk_iscsi_conn *conn, struct spdk_iscsi_tgt_node *target, const char *iqn, const char *addr); struct spdk_iscsi_tgt_node *spdk_iscsi_find_tgt_node(const char *target_name); -int spdk_iscsi_tgt_node_reset(struct spdk_iscsi_tgt_node *target, - uint64_t lun); int spdk_iscsi_tgt_node_cleanup_luns(struct spdk_iscsi_conn *conn, struct spdk_iscsi_tgt_node *target); void spdk_iscsi_tgt_node_delete_map(struct spdk_iscsi_portal_grp *portal_group,