From 1d08c9628830286a777232055209855d88dc6cf9 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Mon, 20 Jul 2020 07:27:24 +0900 Subject: [PATCH] lib/iscsi: Remove unused the param iaddr from iscsi_send_tgts() Previously we might have any possibility to need iaddr in iscsi_send_tgts(), but it is highly unlikely now. Let's remove the param iaddr from iscsi_send_tgts(). Signed-off-by: Shuhei Matsumoto Change-Id: Ide3405706b727a9d6ebaa92ed83509196ff675da Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3442 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Paul Luse Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- lib/iscsi/iscsi.c | 2 -- lib/iscsi/tgt_node.c | 3 +-- lib/iscsi/tgt_node.h | 3 +-- test/unit/lib/iscsi/iscsi.c/iscsi_ut.c | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/iscsi/iscsi.c b/lib/iscsi/iscsi.c index 8487755f2..33fafc654 100644 --- a/lib/iscsi/iscsi.c +++ b/lib/iscsi/iscsi.c @@ -2377,7 +2377,6 @@ iscsi_pdu_payload_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *p data_len = iscsi_send_tgts(conn, conn->initiator_name, - conn->initiator_addr, val, data, alloc_len, data_len); } else { @@ -2392,7 +2391,6 @@ iscsi_pdu_payload_op_text(struct spdk_iscsi_conn *conn, struct spdk_iscsi_pdu *p } else { data_len = iscsi_send_tgts(conn, conn->initiator_name, - conn->initiator_addr, val, data, alloc_len, data_len); } diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index 1e6f0ca50..27a67f1fd 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -298,8 +298,7 @@ iscsi_tgt_node_allow_iscsi_name(struct spdk_iscsi_tgt_node *target, const char * int iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, - const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len, - int data_len) + const char *tiqn, uint8_t *data, int alloc_len, int data_len) { char buf[MAX_TMPBUF]; struct spdk_iscsi_portal_grp *pg; diff --git a/lib/iscsi/tgt_node.h b/lib/iscsi/tgt_node.h index 2787fac91..7507257ef 100644 --- a/lib/iscsi/tgt_node.h +++ b/lib/iscsi/tgt_node.h @@ -102,8 +102,7 @@ void iscsi_shutdown_tgt_node_by_name(const char *target_name, iscsi_tgt_node_destruct_cb cb_fn, void *cb_arg); bool iscsi_tgt_node_is_destructed(struct spdk_iscsi_tgt_node *target); int iscsi_send_tgts(struct spdk_iscsi_conn *conn, const char *iiqn, - const char *iaddr, const char *tiqn, uint8_t *data, int alloc_len, - int data_len); + const char *tiqn, uint8_t *data, int alloc_len, int data_len); /* * bdev_name_list and lun_id_list are equal sized arrays of size num_luns. diff --git a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c index f96afd999..97ce93477 100644 --- a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c +++ b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c @@ -80,7 +80,7 @@ iscsi_tgt_node_access(struct spdk_iscsi_conn *conn, } DEFINE_STUB(iscsi_send_tgts, int, - (struct spdk_iscsi_conn *conn, const char *iiqn, const char *iaddr, + (struct spdk_iscsi_conn *conn, const char *iiqn, const char *tiqn, uint8_t *data, int alloc_len, int data_len), 0);