From: <bva...@us...> - 2017-11-13 16:49:41
|
Revision: 7266 http://sourceforge.net/p/scst/svn/7266 Author: bvassche Date: 2017-11-13 16:49:39 +0000 (Mon, 13 Nov 2017) Log Message: ----------- fcst/fcst.h: Add identifier names Modified Paths: -------------- trunk/fcst/fcst.h trunk/iscsi-scst/kernel/iscsi.h Modified: trunk/fcst/fcst.h =================================================================== --- trunk/fcst/fcst.h 2017-11-13 16:47:43 UTC (rev 7265) +++ trunk/fcst/fcst.h 2017-11-13 16:49:39 UTC (rev 7266) @@ -146,36 +146,34 @@ /* * SCST interface. */ -int ft_send_response(struct scst_cmd *); -int ft_send_xfer_rdy(struct scst_cmd *); -void ft_cmd_timeout(struct scst_cmd *); -void ft_cmd_free(struct scst_cmd *); -void ft_cmd_tm_done(struct scst_mgmt_cmd *); -int ft_tgt_release(struct scst_tgt *); -int ft_tgt_enable(struct scst_tgt *, bool); -bool ft_tgt_enabled(struct scst_tgt *); -int ft_report_aen(struct scst_aen *); -int ft_get_transport_id(struct scst_tgt *, struct scst_session *, uint8_t **); +int ft_send_response(struct scst_cmd *cmd); +int ft_send_xfer_rdy(struct scst_cmd *cmd); +void ft_cmd_timeout(struct scst_cmd *cmd); +void ft_cmd_free(struct scst_cmd *cmd); +void ft_cmd_tm_done(struct scst_mgmt_cmd *mcmd); +int ft_tgt_release(struct scst_tgt *tgt); +int ft_tgt_enable(struct scst_tgt *tgt, bool enable); +bool ft_tgt_enabled(struct scst_tgt *tgt); +int ft_report_aen(struct scst_aen *aen); +int ft_get_transport_id(struct scst_tgt *tgt, struct scst_session *scst_sess, + uint8_t **result); /* * Session interface. */ -int ft_lport_notify(struct notifier_block *, unsigned long, void *); -void ft_lport_add(struct fc_lport *, void *); -void ft_lport_del(struct fc_lport *, void *); +int ft_lport_notify(struct notifier_block *nb, unsigned long event, void *arg); +void ft_lport_add(struct fc_lport *lport, void *arg); +void ft_lport_del(struct fc_lport *lport, void *arg); /* * other internal functions. */ -int ft_thread(void *); bool ft_test_and_set_cmd_state(struct ft_cmd *fcmd, enum ft_cmd_state old, enum ft_cmd_state new); -void ft_recv_req(struct ft_sess *, struct fc_frame *); -void ft_recv_write_data(struct scst_cmd *, struct fc_frame *); -int ft_send_read_data(struct scst_cmd *); -struct ft_tpg *ft_lport_find_tpg(struct fc_lport *); -struct ft_node_acl *ft_acl_get(struct ft_tpg *, struct fc_rport_priv *); -void ft_cmd_dump(struct scst_cmd *, const char *); +void ft_recv_req(struct ft_sess *sess, struct fc_frame *fp); +void ft_recv_write_data(struct scst_cmd *cmd, struct fc_frame *fp); +int ft_send_read_data(struct scst_cmd *cmd); +void ft_cmd_dump(struct scst_cmd *cmd, const char *caller); /* #define FCST_INJECT_SEND_ERRORS 2 */ Modified: trunk/iscsi-scst/kernel/iscsi.h =================================================================== --- trunk/iscsi-scst/kernel/iscsi.h 2017-11-13 16:47:43 UTC (rev 7265) +++ trunk/iscsi-scst/kernel/iscsi.h 2017-11-13 16:49:39 UTC (rev 7266) @@ -540,15 +540,15 @@ extern struct kmem_cache *iscsi_sess_cache; /* iscsi.c */ -extern struct iscsi_cmnd *cmnd_alloc(struct iscsi_conn *, +extern struct iscsi_cmnd *cmnd_alloc(struct iscsi_conn *conn, struct iscsi_cmnd *parent); -extern int cmnd_rx_start(struct iscsi_cmnd *); +extern int cmnd_rx_start(struct iscsi_cmnd *cmnd); extern int cmnd_rx_continue(struct iscsi_cmnd *req); -extern void cmnd_rx_end(struct iscsi_cmnd *); -extern void cmnd_tx_start(struct iscsi_cmnd *); -extern void cmnd_tx_end(struct iscsi_cmnd *); +extern void cmnd_rx_end(struct iscsi_cmnd *cmnd); +extern void cmnd_tx_start(struct iscsi_cmnd *cmnd); +extern void cmnd_tx_end(struct iscsi_cmnd *cmnd); extern void req_cmnd_release_force(struct iscsi_cmnd *req); -extern void rsp_cmnd_release(struct iscsi_cmnd *); +extern void rsp_cmnd_release(struct iscsi_cmnd *cmnd); extern void iscsi_drop_delayed_tm_rsp(struct iscsi_cmnd *tm_rsp); extern void cmnd_done(struct iscsi_cmnd *cmnd); extern void conn_abort(struct iscsi_conn *conn); @@ -567,19 +567,21 @@ #ifndef CONFIG_SCST_PROC extern struct kobj_type iscsi_conn_ktype; #endif -extern struct iscsi_conn *conn_lookup(struct iscsi_session *, u16); -extern void conn_reinst_finished(struct iscsi_conn *); -extern int __add_conn(struct iscsi_session *, struct iscsi_kern_conn_info *); -extern int __del_conn(struct iscsi_session *, struct iscsi_kern_conn_info *); -extern void conn_free(struct iscsi_conn *); +extern struct iscsi_conn *conn_lookup(struct iscsi_session *session, u16 cid); +extern void conn_reinst_finished(struct iscsi_conn *conn); +extern int __add_conn(struct iscsi_session *session, + struct iscsi_kern_conn_info *info); +extern int __del_conn(struct iscsi_session *session, + struct iscsi_kern_conn_info *info); +extern void conn_free(struct iscsi_conn *conn); extern void iscsi_make_conn_rd_active(struct iscsi_conn *conn); #define ISCSI_CONN_ACTIVE_CLOSE 1 #define ISCSI_CONN_DELETING 2 -extern void __mark_conn_closed(struct iscsi_conn *, int); -extern void mark_conn_closed(struct iscsi_conn *); -extern void iscsi_make_conn_wr_active(struct iscsi_conn *); +extern void __mark_conn_closed(struct iscsi_conn *conn, int flags); +extern void mark_conn_closed(struct iscsi_conn *conn); +extern void iscsi_make_conn_wr_active(struct iscsi_conn *conn); #ifdef CONFIG_SCST_PROC -extern void conn_info_show(struct seq_file *, struct iscsi_session *); +extern void conn_info_show(struct seq_file *seq, struct iscsi_session *session); #endif extern void iscsi_check_tm_data_wait_timeouts(struct iscsi_conn *conn, bool force); @@ -607,8 +609,8 @@ enum iscsi_kern_event_code code, const char *param1, const char *param2, void **data); #endif -extern struct iscsi_target *target_lookup_by_id(u32); -extern int __add_target(struct iscsi_kern_target_info *); +extern struct iscsi_target *target_lookup_by_id(u32 id); +extern int __add_target(struct iscsi_kern_target_info *info); extern int __del_target(u32 id); extern ssize_t iscsi_sysfs_add_target(const char *target_name, char *params); extern ssize_t iscsi_sysfs_del_target(const char *target_name); @@ -637,11 +639,12 @@ extern const struct attribute *iscsi_acg_attrs[]; #endif extern const struct file_operations session_seq_fops; -extern struct iscsi_session *session_lookup(struct iscsi_target *, u64); -extern void sess_reinst_finished(struct iscsi_session *); -extern int __add_session(struct iscsi_target *, - struct iscsi_kern_session_info *); -extern int __del_session(struct iscsi_target *, u64); +extern struct iscsi_session *session_lookup(struct iscsi_target *target, + u64 sid); +extern void sess_reinst_finished(struct iscsi_session *session); +extern int __add_session(struct iscsi_target *target, + struct iscsi_kern_session_info *info); +extern int __del_session(struct iscsi_target *target, u64 sid); extern int session_free(struct iscsi_session *session, bool del); extern void iscsi_sess_force_close(struct iscsi_session *sess); @@ -648,12 +651,13 @@ /* params.c */ extern const char *iscsi_get_digest_name(int val, char *res); extern const char *iscsi_get_bool_value(int val); -extern int iscsi_params_set(struct iscsi_target *, - struct iscsi_kern_params_info *, int); +extern int iscsi_params_set(struct iscsi_target *target, + struct iscsi_kern_params_info *info, int set); /* event.c */ -extern int event_send(u32, u64, u32, u32, enum iscsi_kern_event_code, - const char *param1, const char *param2); +extern int event_send(u32 tid, u64 sid, u32 cid, u32 cookie, + enum iscsi_kern_event_code code, + const char *param1, const char *param2); extern int event_init(void); extern void event_exit(void); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |