From c5ef36742ac747ccda8f39d02288216a686c6b9f Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 29 Oct 2019 16:38:37 +0900 Subject: [PATCH] lib/iscsi: Move function declaration to param.h to match function body Four functions are defined in param.c and so moving their declaration from iscsi.h to param.h is a little easier to read. Signed-off-by: Shuhei Matsumoto Change-Id: Id16eab56d20d7ec99759e69525e791b091a93783 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/472673 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris Reviewed-by: Ziye Yang --- lib/iscsi/iscsi.h | 8 -------- lib/iscsi/param.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h index a4d8d31c5..73fee1c98 100644 --- a/lib/iscsi/iscsi.h +++ b/lib/iscsi/iscsi.h @@ -422,9 +422,6 @@ int spdk_iscsi_handle_incoming_pdus(struct spdk_iscsi_conn *conn); void spdk_iscsi_task_mgmt_response(struct spdk_iscsi_conn *conn, struct spdk_iscsi_task *task); -int spdk_iscsi_conn_params_init(struct iscsi_param **params); -int spdk_iscsi_sess_params_init(struct iscsi_param **params); - void spdk_free_sess(struct spdk_iscsi_sess *sess); void spdk_clear_all_transfer_task(struct spdk_iscsi_conn *conn, struct spdk_scsi_lun *lun, @@ -432,11 +429,6 @@ void spdk_clear_all_transfer_task(struct spdk_iscsi_conn *conn, void spdk_del_transfer_task(struct spdk_iscsi_conn *conn, uint32_t CmdSN); bool spdk_iscsi_is_deferred_free_pdu(struct spdk_iscsi_pdu *pdu); -int spdk_iscsi_negotiate_params(struct spdk_iscsi_conn *conn, - struct iscsi_param **params_p, uint8_t *data, - int alloc_len, int data_len); -int spdk_iscsi_copy_param2var(struct spdk_iscsi_conn *conn); - void spdk_iscsi_task_cpl(struct spdk_scsi_task *scsi_task); void spdk_iscsi_task_mgmt_cpl(struct spdk_scsi_task *scsi_task); uint32_t spdk_iscsi_pdu_calc_header_digest(struct spdk_iscsi_pdu *pdu); diff --git a/lib/iscsi/param.h b/lib/iscsi/param.h index c9dc8cab9..fa6807e8a 100644 --- a/lib/iscsi/param.h +++ b/lib/iscsi/param.h @@ -37,6 +37,8 @@ #include "spdk/stdinc.h" +struct spdk_iscsi_conn; + enum iscsi_param_type { ISPT_INVALID = -1, ISPT_NOTSPECIFIED = 0, @@ -81,4 +83,12 @@ int spdk_iscsi_param_eq_val(struct iscsi_param *params, const char *key, const char *val); +int spdk_iscsi_negotiate_params(struct spdk_iscsi_conn *conn, + struct iscsi_param **params_p, uint8_t *data, + int alloc_len, int data_len); +int spdk_iscsi_copy_param2var(struct spdk_iscsi_conn *conn); + +int spdk_iscsi_conn_params_init(struct iscsi_param **params); +int spdk_iscsi_sess_params_init(struct iscsi_param **params); + #endif /* SPDK_ISCSI_PARAM_H */